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

Rename Board --> BoardOld

Browse Source
This commit is contained in:
Olof Larsson
2013-04-11 07:01:30 +02:00
parent 828c149cb0
commit 9d347715d5
18 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/cmd/CmdFactionsAccess.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FLocation;
@ -38,7 +38,7 @@ public class CmdFactionsAccess extends FCommand
type = (type == null) ? "" : type.toLowerCase();
FLocation loc = new FLocation(me.getLocation());
TerritoryAccess territory = Board.getTerritoryAccessAt(loc);
TerritoryAccess territory = BoardOld.getTerritoryAccessAt(loc);
Faction locFaction = territory.getHostFaction();
boolean accessAny = Perm.ACCESS_ANY.has(sender, false);

4
src/com/massivecraft/factions/cmd/CmdFactionsHome.java
View File

@ -7,7 +7,7 @@ import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FLocation;
@ -75,7 +75,7 @@ public class CmdFactionsHome extends FCommand
return;
}
Faction faction = Board.getFactionAt(new FLocation(me.getLocation()));
Faction faction = BoardOld.getFactionAt(new FLocation(me.getLocation()));
Location loc = me.getLocation().clone();
// if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby

4
src/com/massivecraft/factions/cmd/CmdFactionsMap.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Perm;
@ -61,7 +61,7 @@ public class CmdFactionsMap extends FCommand
public void showMap()
{
sendMessage(Board.getMap(myFaction, new FLocation(fme), fme.getPlayer().getLocation().getYaw()));
sendMessage(BoardOld.getMap(myFaction, new FLocation(fme), fme.getPlayer().getLocation().getYaw()));
}
}

6
src/com/massivecraft/factions/cmd/CmdFactionsReload.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Factions;
@ -36,7 +36,7 @@ public class CmdFactionsReload extends FCommand
if (file.startsWith("b"))
{
Board.load();
BoardOld.load();
fileName = "board.json";
}
else if (file.startsWith("f"))
@ -54,7 +54,7 @@ public class CmdFactionsReload extends FCommand
fileName = "all";
FPlayerColl.i.loadFromDisc();
FactionColl.i.loadFromDisc();
Board.load();
BoardOld.load();
}
else
{

4
src/com/massivecraft/factions/cmd/CmdFactionsSaveAll.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.FactionColl;
import com.massivecraft.factions.Perm;
@ -31,7 +31,7 @@ public class CmdFactionsSaveAll extends FCommand
{
FPlayerColl.i.saveToDisc();
FactionColl.i.saveToDisc();
Board.save();
BoardOld.save();
msg("<i>Factions saved to disk!");
}

4
src/com/massivecraft/factions/cmd/CmdFactionsSethome.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPerm;
@ -47,7 +47,7 @@ public class CmdFactionsSethome extends FCommand
&&
ConfServer.homesMustBeInClaimedTerritory
&&
Board.getFactionAt(new FLocation(me)) != faction
BoardOld.getFactionAt(new FLocation(me)) != faction
)
{
fme.msg("<b>Sorry, your faction home can only be set inside your own claimed territory.");

6
src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import org.bukkit.Bukkit;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.event.LandUnclaimEvent;
import com.massivecraft.factions.integration.Econ;
@ -36,7 +36,7 @@ public class CmdFactionsUnclaim extends FCommand
public void perform()
{
FLocation flocation = new FLocation(fme);
Faction otherFaction = Board.getFactionAt(flocation);
Faction otherFaction = BoardOld.getFactionAt(flocation);
if ( ! FPerm.TERRITORY.has(sender, otherFaction, true)) return;
@ -59,7 +59,7 @@ public class CmdFactionsUnclaim extends FCommand
}
}
Board.removeAt(flocation);
BoardOld.removeAt(flocation);
SpoutFeatures.updateTerritoryDisplayLoc(flocation);
myFaction.msg("%s<i> unclaimed some land.", fme.describeTo(myFaction, true));

4
src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
import org.bukkit.Bukkit;
import com.massivecraft.factions.Board;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
@ -49,7 +49,7 @@ public class CmdFactionsUnclaimall extends FCommand
Bukkit.getServer().getPluginManager().callEvent(unclaimAllEvent);
// this event cannot be cancelled
Board.unclaimAll(myFaction.getId());
BoardOld.unclaimAll(myFaction.getId());
myFaction.msg("%s<i> unclaimed ALL of your faction's land.", fme.describeTo(myFaction, true));
SpoutFeatures.updateTerritoryDisplayLoc(null);