EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the implementation specific customData. It's now added to all entities in Mcore.

Browse Source
This commit is contained in:
Olof Larsson
2013-09-10 03:34:54 +02:00
parent b484b6bb38
commit 34681c7340
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/massivecraft/factions/entity/Faction.java
View File

@@ -24,8 +24,6 @@ import com.massivecraft.mcore.store.Entity;
import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.util.SenderUtil; import com.massivecraft.mcore.util.SenderUtil;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
import com.massivecraft.mcore.xlib.gson.JsonObject;
public class Faction extends Entity<Faction> implements EconomyParticipator public class Faction extends Entity<Faction> implements EconomyParticipator
{ {
@@ -55,7 +53,6 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
this.setRelationWishes(that.relationWishes); this.setRelationWishes(that.relationWishes);
this.setFlags(that.flags); this.setFlags(that.flags);
this.setPerms(that.perms); this.setPerms(that.perms);
this.setCustomData(that.getCustomData());
return this; return this;
} }
@@ -127,11 +124,6 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
// Null means default for the universe. // Null means default for the universe.
private Map<FPerm, Set<Rel>> perms = null; private Map<FPerm, Set<Rel>> 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 // FIELD: id
// -------------------------------------------- // // -------------------------------------------- //

8
src/com/massivecraft/factions/entity/MPlayer.java
View File

@@ -2,7 +2,6 @@ package com.massivecraft.factions.entity;
import com.massivecraft.factions.Perm; import com.massivecraft.factions.Perm;
import com.massivecraft.mcore.store.SenderEntity; import com.massivecraft.mcore.store.SenderEntity;
import com.massivecraft.mcore.xlib.gson.JsonObject;
public class MPlayer extends SenderEntity<MPlayer> public class MPlayer extends SenderEntity<MPlayer>
{ {
@@ -24,7 +23,6 @@ public class MPlayer extends SenderEntity<MPlayer>
{ {
this.mapAutoUpdating = that.mapAutoUpdating; this.mapAutoUpdating = that.mapAutoUpdating;
this.usingAdminMode = that.usingAdminMode; this.usingAdminMode = that.usingAdminMode;
this.setCustomData(that.getCustomData());
return this; return this;
} }
@@ -34,7 +32,6 @@ public class MPlayer extends SenderEntity<MPlayer>
{ {
if (this.isMapAutoUpdating()) return false; if (this.isMapAutoUpdating()) return false;
if (this.isUsingAdminMode()) return false; if (this.isUsingAdminMode()) return false;
if (this.getCustomData() != null && this.getCustomData().entrySet().size() > 0) return false;
return true; return true;
} }
@@ -59,9 +56,4 @@ public class MPlayer extends SenderEntity<MPlayer>
} }
public void setUsingAdminMode(boolean usingAdminMode) { this.usingAdminMode = usingAdminMode; this.changed(); } 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; }
} }

8
src/com/massivecraft/factions/entity/UPlayer.java
View File

@@ -24,7 +24,6 @@ import com.massivecraft.mcore.store.SenderEntity;
import com.massivecraft.mcore.util.MUtil; import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.util.SenderUtil; import com.massivecraft.mcore.util.SenderUtil;
import com.massivecraft.mcore.util.Txt; import com.massivecraft.mcore.util.Txt;
import com.massivecraft.mcore.xlib.gson.JsonObject;
public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipator public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipator
@@ -50,7 +49,6 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
this.setTitle(that.title); this.setTitle(that.title);
this.setPowerBoost(that.powerBoost); this.setPowerBoost(that.powerBoost);
this.setPower(that.power); this.setPower(that.power);
this.setCustomData(that.getCustomData());
return this; return this;
} }
@@ -62,7 +60,6 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
// Role means nothing without a faction. // Role means nothing without a faction.
// Title 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.getPowerRounded() != (int) Math.round(UConf.get(this).defaultPlayerPower)) return false;
if (this.getCustomData() != null && this.getCustomData().entrySet().size() > 0) return false;
return true; return true;
} }
@@ -137,11 +134,6 @@ public class UPlayer extends SenderEntity<UPlayer> implements EconomyParticipato
public Faction getAutoClaimFaction() { return this.autoClaimFaction; } public Faction getAutoClaimFaction() { return this.autoClaimFaction; }
public void setAutoClaimFaction(Faction autoClaimFaction) { this.autoClaimFaction = 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 // FIELDS: MULTIVERSE PROXY
// -------------------------------------------- // // -------------------------------------------- //