diff --git a/src/com/massivecraft/factions/entity/Faction.java b/src/com/massivecraft/factions/entity/Faction.java index 33668c00..7a4344b0 100644 --- a/src/com/massivecraft/factions/entity/Faction.java +++ b/src/com/massivecraft/factions/entity/Faction.java @@ -24,8 +24,6 @@ import com.massivecraft.mcore.store.Entity; import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.SenderUtil; import com.massivecraft.mcore.util.Txt; -import com.massivecraft.mcore.xlib.gson.JsonObject; - public class Faction extends Entity implements EconomyParticipator { @@ -55,7 +53,6 @@ public class Faction extends Entity implements EconomyParticipator this.setRelationWishes(that.relationWishes); this.setFlags(that.flags); this.setPerms(that.perms); - this.setCustomData(that.getCustomData()); return this; } @@ -127,11 +124,6 @@ public class Faction extends Entity implements EconomyParticipator // Null means default for the universe. private Map> perms = null; - // Custom Data - Since JsonObject is mutable there is not point to using fancy getters/setters. - private JsonObject customData = null; - public JsonObject getCustomData() { return this.customData; } - public void setCustomData(JsonObject customData) { this.customData = customData; } - // -------------------------------------------- // // FIELD: id // -------------------------------------------- // diff --git a/src/com/massivecraft/factions/entity/MPlayer.java b/src/com/massivecraft/factions/entity/MPlayer.java index cd641f24..7b18fd26 100644 --- a/src/com/massivecraft/factions/entity/MPlayer.java +++ b/src/com/massivecraft/factions/entity/MPlayer.java @@ -2,7 +2,6 @@ package com.massivecraft.factions.entity; import com.massivecraft.factions.Perm; import com.massivecraft.mcore.store.SenderEntity; -import com.massivecraft.mcore.xlib.gson.JsonObject; public class MPlayer extends SenderEntity { @@ -24,7 +23,6 @@ public class MPlayer extends SenderEntity { this.mapAutoUpdating = that.mapAutoUpdating; this.usingAdminMode = that.usingAdminMode; - this.setCustomData(that.getCustomData()); return this; } @@ -34,7 +32,6 @@ public class MPlayer extends SenderEntity { if (this.isMapAutoUpdating()) return false; if (this.isUsingAdminMode()) return false; - if (this.getCustomData() != null && this.getCustomData().entrySet().size() > 0) return false; return true; } @@ -59,9 +56,4 @@ public class MPlayer extends SenderEntity } public void setUsingAdminMode(boolean usingAdminMode) { this.usingAdminMode = usingAdminMode; this.changed(); } - // Custom Data - Since JsonObject is mutable there is not point to using fancy getters/setters. - private JsonObject customData = null; - public JsonObject getCustomData() { return this.customData; } - public void setCustomData(JsonObject customData) { this.customData = customData; } - } diff --git a/src/com/massivecraft/factions/entity/UPlayer.java b/src/com/massivecraft/factions/entity/UPlayer.java index db300513..869f6ae4 100644 --- a/src/com/massivecraft/factions/entity/UPlayer.java +++ b/src/com/massivecraft/factions/entity/UPlayer.java @@ -24,7 +24,6 @@ import com.massivecraft.mcore.store.SenderEntity; import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.SenderUtil; import com.massivecraft.mcore.util.Txt; -import com.massivecraft.mcore.xlib.gson.JsonObject; public class UPlayer extends SenderEntity implements EconomyParticipator @@ -50,7 +49,6 @@ public class UPlayer extends SenderEntity implements EconomyParticipato this.setTitle(that.title); this.setPowerBoost(that.powerBoost); this.setPower(that.power); - this.setCustomData(that.getCustomData()); return this; } @@ -62,7 +60,6 @@ public class UPlayer extends SenderEntity implements EconomyParticipato // Role means nothing without a faction. // Title means nothing without a faction. if (this.getPowerRounded() != (int) Math.round(UConf.get(this).defaultPlayerPower)) return false; - if (this.getCustomData() != null && this.getCustomData().entrySet().size() > 0) return false; return true; } @@ -137,11 +134,6 @@ public class UPlayer extends SenderEntity implements EconomyParticipato public Faction getAutoClaimFaction() { return this.autoClaimFaction; } public void setAutoClaimFaction(Faction autoClaimFaction) { this.autoClaimFaction = autoClaimFaction; } - // Custom Data - Since JsonObject is mutable there is not point to using fancy getters/setters. - private JsonObject customData = null; - public JsonObject getCustomData() { return this.customData; } - public void setCustomData(JsonObject customData) { this.customData = customData; } - // -------------------------------------------- // // FIELDS: MULTIVERSE PROXY // -------------------------------------------- //