SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate Factions#getNone in favor of Factions#getWilderness

Browse Source
This commit is contained in:
drtshock 2015-07-23 14:39:50 -05:00
parent 03cc7f7394
commit 786f2d655f
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/massivecraft/factions/Factions.java
View File

@ -26,8 +26,11 @@ public abstract class Factions {
public abstract ArrayList<Faction> getAllFactions(); public abstract ArrayList<Faction> getAllFactions();
@Deprecated
public abstract Faction getNone(); public abstract Faction getNone();
public abstract Faction getWilderness();
public abstract Faction getSafeZone(); public abstract Faction getSafeZone();
public abstract Faction getWarZone(); public abstract Faction getWarZone();

2
src/main/java/com/massivecraft/factions/cmd/CmdTop.java
View File

@ -37,7 +37,7 @@ public class CmdTop extends FCommand {
// Can sort by: money, members, online, allies, enemies, power, land. // Can sort by: money, members, online, allies, enemies, power, land.
// Get all Factions and remove non player ones. // Get all Factions and remove non player ones.
ArrayList<Faction> factionList = Factions.getInstance().getAllFactions(); ArrayList<Faction> factionList = Factions.getInstance().getAllFactions();
factionList.remove(Factions.getInstance().getNone()); factionList.remove(Factions.getInstance().getWilderness());
factionList.remove(Factions.getInstance().getSafeZone()); factionList.remove(Factions.getInstance().getSafeZone());
factionList.remove(Factions.getInstance().getWarZone()); factionList.remove(Factions.getInstance().getWarZone());

5
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFactions.java
View File

@ -157,6 +157,11 @@ public abstract class MemoryFactions extends Factions {
return factions.get("0"); return factions.get("0");
} }
@Override
public Faction getWilderness() {
return factions.get("0");
}
@Override @Override
public Faction getSafeZone() { public Faction getSafeZone() {
return factions.get("-1"); return factions.get("-1");