diff --git a/src/com/massivecraft/factions/Faction.java b/src/com/massivecraft/factions/Faction.java index 8a799f1f..b36ead78 100644 --- a/src/com/massivecraft/factions/Faction.java +++ b/src/com/massivecraft/factions/Faction.java @@ -28,7 +28,7 @@ public class Faction { private transient int id; private Map relationWish; - private Map> claimOwnership; + private Map> claimOwnership = new HashMap>(); private Set invites; // Where string is a lowercase player name private boolean open; private String tag; @@ -414,21 +414,11 @@ public class Faction { // Ownership of specific claims //----------------------------------------------// - private boolean isClaimOwnershipEmpty() { - if (claimOwnership == null) { - claimOwnership = new HashMap>(); - return true; - } - return claimOwnership.isEmpty(); - } - public void clearAllClaimOwnership() { - isClaimOwnershipEmpty(); claimOwnership.clear(); } public void clearClaimOwnership(FLocation loc) { - isClaimOwnershipEmpty(); claimOwnership.remove(loc); } @@ -437,8 +427,6 @@ public class Faction { return; } - isClaimOwnershipEmpty(); - Set ownerData; String player = playerName.toLowerCase(); @@ -463,11 +451,11 @@ public class Faction { } public int getCountOfClaimsWithOwners() { - return isClaimOwnershipEmpty() ? 0 : claimOwnership.size(); + return claimOwnership.isEmpty() ? 0 : claimOwnership.size(); } public boolean doesLocationHaveOwnersSet(FLocation loc) { - if (isClaimOwnershipEmpty() || !claimOwnership.containsKey(loc)) { + if (claimOwnership.isEmpty() || !claimOwnership.containsKey(loc)) { return false; } Set ownerData = claimOwnership.get(loc); @@ -475,7 +463,7 @@ public class Faction { } public boolean isPlayerInOwnerList(String playerName, FLocation loc) { - if (isClaimOwnershipEmpty()) { + if (claimOwnership.isEmpty()) { return false; } Set ownerData = claimOwnership.get(loc); @@ -489,7 +477,6 @@ public class Faction { } public void setPlayerAsOwner(String playerName, FLocation loc) { - isClaimOwnershipEmpty(); Set ownerData = claimOwnership.get(loc); if (ownerData == null) { ownerData = new HashSet(); @@ -499,7 +486,6 @@ public class Faction { } public void removePlayerAsOwner(String playerName, FLocation loc) { - isClaimOwnershipEmpty(); Set ownerData = claimOwnership.get(loc); if (ownerData == null) { return; @@ -509,12 +495,10 @@ public class Faction { } public Set getOwnerList(FLocation loc) { - isClaimOwnershipEmpty(); return claimOwnership.get(loc); } public String getOwnerListString(FLocation loc) { - isClaimOwnershipEmpty(); Set ownerData = claimOwnership.get(loc); if (ownerData == null || ownerData.isEmpty()) { return ""; @@ -544,7 +528,7 @@ public class Faction { } // make sure claimOwnership is initialized - if (isClaimOwnershipEmpty()) { + if (claimOwnership.isEmpty()) { return true; }