diff --git a/src/dataStructures/KittyGuild.java b/src/dataStructures/KittyGuild.java index fd78f9f..583311a 100644 --- a/src/dataStructures/KittyGuild.java +++ b/src/dataStructures/KittyGuild.java @@ -1,6 +1,8 @@ package dataStructures; import java.util.ArrayList; + +import core.DatabaseManager; import core.DatabaseTrackedObject; import utils.AdminControl; @@ -27,6 +29,12 @@ public class KittyGuild extends DatabaseTrackedObject private String commandIndicator; + private void RegisterTrackedObjects() + { + DatabaseManager.instance.Register(roleList); + DatabaseManager.instance.Register(beans); + } + // Default content for a guild public KittyGuild(String uniqueID, AdminControl adminControl, ArrayList emoji) { @@ -34,6 +42,7 @@ public class KittyGuild extends DatabaseTrackedObject this.uniqueID = uniqueID; roleList = new KittyTrackedVector(roleListName, uniqueID); beans = new KittyTrackedLong(beansName, uniqueID); + RegisterTrackedObjects(); control = adminControl; this.contentRating = KittyRating.Safe; @@ -49,6 +58,7 @@ public class KittyGuild extends DatabaseTrackedObject this.uniqueID = uniqueID; roleList = new KittyTrackedVector(roleListName, uniqueID); beans = new KittyTrackedLong(beansName, uniqueID); + RegisterTrackedObjects(); SetCommandIndicator(commandIndicator); this.contentRating = contentRating; diff --git a/src/dataStructures/KittyTrackedLong.java b/src/dataStructures/KittyTrackedLong.java index 2f5f9a0..98f450e 100644 --- a/src/dataStructures/KittyTrackedLong.java +++ b/src/dataStructures/KittyTrackedLong.java @@ -1,5 +1,6 @@ package dataStructures; +import core.DatabaseManager; import core.DatabaseTrackedObject; import utils.GlobalLog; import utils.LogFilter; @@ -12,6 +13,7 @@ import utils.LogFilter; // public SomeConstructor(...) // { // myValue = new KittyTrackedLong("friendlyName", this.UniqueID); +// DatabaseManager.instance.Register(myValue); // } // public class KittyTrackedLong extends DatabaseTrackedObject @@ -32,7 +34,6 @@ public class KittyTrackedLong extends DatabaseTrackedObject { tracked += toAdd; MarkDirty(); - System.out.println("DIRTY"); return tracked; } @@ -40,7 +41,6 @@ public class KittyTrackedLong extends DatabaseTrackedObject { tracked -= toSubtract; MarkDirty(); - System.out.println("DIRTY"); return tracked; } @@ -74,7 +74,7 @@ public class KittyTrackedLong extends DatabaseTrackedObject catch(Exception e) { tracked = 0; - GlobalLog.Error(LogFilter.Core, "Failed to deserialize long with database ID " + databaseID); + GlobalLog.Error(LogFilter.Core, "Falling back to default of 0 due to failure to deserialize long with database ID " + databaseID); } } else