AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-22 03:55:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start rewriting economy database table structure - store money in Players table instead, with economy table only tracking players who have performed transactions.

Browse Source
This commit is contained in:
UnknownShadow200 2016-09-02 14:56:27 +10:00
parent e3d6177794
commit a204527ebb
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Economy/Economy.cs
View File

@ -55,21 +55,15 @@ PRIMARY KEY(player)
}
public static void LoadDatabase() {
retry:
Database.Execute(createTable); //create database
DataTable eco = Database.Fill("SELECT * FROM Economy");
try {
DataTable players = Database.Fill("SELECT * FROM Players");
if (players.Rows.Count == eco.Rows.Count) { } //move along, nothing to do here
else if (eco.Rows.Count == 0) { //if first time, copy content from player to economy
Database.Execute("INSERT INTO Economy (player, money) SELECT Players.Name, Players.Money FROM Players");
} else {
//this will only be needed when the server shuts down while it was copying content (or some other error)
Database.Backend.DeleteTable("Economy");
goto retry;
}
players.Dispose(); eco.Dispose();
} catch { }
Database.Execute(createTable);
DataTable eco = Database.Fill("SELECT (player, money) FROM Economy");
foreach (DataRow row in eco) {
int money = PlayerData.ParseInt(row["money"].ToString());
if (money == 0) continue;
UpdateMoney(row["player"].ToString(), money);
// TODO: remove zero money in Economy table
}
}
public static void Load() {
@ -109,7 +103,7 @@ PRIMARY KEY(player)
public static void Save() {
using (StreamWriter w = new StreamWriter("properties/economy.properties", false)) {
w.WriteLine("enabled:" + Enabled);
w.WriteLine("enabled:" + Enabled);
foreach (Item item in Items) {
w.WriteLine();
item.Serialise(w);
@ -143,6 +137,11 @@ PRIMARY KEY(player)
Database.Execute(type + " Economy (player, money, total, purchase, payment, salary, fine) " +
"VALUES (@0, @1, @2, @3, @4, @5, @6)", es.playerName, es.money, es.totalSpent,
es.purchase, es.payment, es.salary, es.fine);
UpdateMoney(es.playerName, es.money);
}
public static void UpdateMoney(string name, int money) {
Database.Execute("UPDATE Players SET Money=@0 WHERE Name=@1", name, money);
}
public static Item[] Items = { new ColorItem(), new TitleColorItem(),

6
Player/Player.cs
View File

@ -118,12 +118,6 @@ namespace MCGalaxy {
totalLogins, overallDeath, money, blocks,
cuboided, totalKicked, time.ToDBTime(), name);
if (Economy.Enabled && loginMoney != money) {
Economy.EcoStats ecos = Economy.RetrieveEcoStats(name);
ecos.money = money;
Economy.UpdateEcoStats(ecos);
}
Server.zombie.SaveZombieStats(this);
SaveUndo(this);
}

9
Player/PlayerData.cs
View File

@ -46,11 +46,6 @@ namespace MCGalaxy {
", Money, totalBlocks, totalKicked, TimeSpent) VALUES (@0, @1, @2, @2, @3, @4, @5, @5, @5, @5, @6)";
Database.Execute(query,
p.name, p.ip, now, 1, "", 0, p.time.ToDBTime());
const string ecoQuery = "INSERT INTO Economy (player, money, total, purchase, payment, salary, fine) " +
"VALUES (@0, @1, @2, @3, @3, @3, @3)";
Database.Execute(ecoQuery,
p.name, p.money, 0, "%cNone");
}
internal static void Load(DataTable playerDb, Player p) {
@ -74,9 +69,7 @@ namespace MCGalaxy {
p.TotalPlaced = data.TotalPlaced;
p.TotalDeleted = data.TotalDeleted;
//money = int.Parse(data.money);
p.money = Economy.RetrieveEcoStats(p.name).money;
p.loginMoney = p.money;
p.money = data.Money;
p.totalKicked = data.Kicks;
}