diff --git a/src/main/java/com/massivecraft/factions/Factions.java b/src/main/java/com/massivecraft/factions/Factions.java index b1acb5d7..8fc468ad 100644 --- a/src/main/java/com/massivecraft/factions/Factions.java +++ b/src/main/java/com/massivecraft/factions/Factions.java @@ -26,8 +26,11 @@ public abstract class Factions { public abstract ArrayList getAllFactions(); + @Deprecated public abstract Faction getNone(); + public abstract Faction getWilderness(); + public abstract Faction getSafeZone(); public abstract Faction getWarZone(); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdTop.java b/src/main/java/com/massivecraft/factions/cmd/CmdTop.java index dc456645..b989afd9 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdTop.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdTop.java @@ -37,7 +37,7 @@ public class CmdTop extends FCommand { // Can sort by: money, members, online, allies, enemies, power, land. // Get all Factions and remove non player ones. ArrayList factionList = Factions.getInstance().getAllFactions(); - factionList.remove(Factions.getInstance().getNone()); + factionList.remove(Factions.getInstance().getWilderness()); factionList.remove(Factions.getInstance().getSafeZone()); factionList.remove(Factions.getInstance().getWarZone()); diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFactions.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFactions.java index 6d5dec2f..8bb3f17f 100644 --- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFactions.java +++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFactions.java @@ -157,6 +157,11 @@ public abstract class MemoryFactions extends Factions { return factions.get("0"); } + @Override + public Faction getWilderness() { + return factions.get("0"); + } + @Override public Faction getSafeZone() { return factions.get("-1");