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

Use PS instead of FLocation in a few places.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-11 11:11:31 +02:00
parent 4cc36b8d96
commit 4a63d50cbb
22 changed files with 217 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.BoardColl;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.mcore.ps.PS;
import com.massivecraft.mcore.util.Txt;
@ -36,9 +36,9 @@ public class CmdFactionsAccess extends FCommand
{
String type = this.argAsString(0);
type = (type == null) ? "" : type.toLowerCase();
FLocation loc = new FLocation(me.getLocation());
PS loc = PS.valueOf(me);
TerritoryAccess territory = BoardOld.getTerritoryAccessAt(loc);
TerritoryAccess territory = BoardColl.get().getTerritoryAccessAt(loc);
Faction locFaction = territory.getHostFaction();
boolean accessAny = Perm.ACCESS_ANY.has(sender, false);

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

@ -7,16 +7,16 @@ import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.BoardColl;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FFlag;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.FPlayerColl;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.integration.EssentialsFeatures;
import com.massivecraft.mcore.ps.PS;
import com.massivecraft.mcore.util.SmokeUtil;
@ -75,7 +75,8 @@ public class CmdFactionsHome extends FCommand
return;
}
Faction faction = BoardOld.getFactionAt(new FLocation(me.getLocation()));
Faction faction = BoardColl.get().getFactionAt(PS.valueOf(me));
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

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

@ -1,9 +1,9 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.BoardColl;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.Perm;
import com.massivecraft.mcore.ps.PS;
public class CmdFactionsMap extends FCommand
@ -61,7 +61,7 @@ public class CmdFactionsMap extends FCommand
public void showMap()
{
sendMessage(BoardOld.getMap(myFaction, new FLocation(fme), fme.getPlayer().getLocation().getYaw()));
sendMessage(BoardColl.get().getMap(myFaction, PS.valueOf(me), fme.getPlayer().getLocation().getYaw()));
}
}

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

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

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

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

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

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

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

@ -2,16 +2,16 @@ package com.massivecraft.factions.cmd;
import org.bukkit.Bukkit;
import com.massivecraft.factions.BoardOld;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.event.LandUnclaimEvent;
import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.integration.SpoutFeatures;
import com.massivecraft.factions.FLocation;
import com.massivecraft.factions.BoardColl;
import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.mcore.ps.PS;
public class CmdFactionsUnclaim extends FCommand
{
@ -35,12 +35,12 @@ public class CmdFactionsUnclaim extends FCommand
@Override
public void perform()
{
FLocation flocation = new FLocation(fme);
Faction otherFaction = BoardOld.getFactionAt(flocation);
PS chunk = PS.valueOf(me).getChunk(true);
Faction otherFaction = BoardColl.get().getFactionAt(chunk);
if ( ! FPerm.TERRITORY.has(sender, otherFaction, true)) return;
LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(flocation, otherFaction, fme);
LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(chunk, otherFaction, fme);
Bukkit.getServer().getPluginManager().callEvent(unclaimEvent);
if(unclaimEvent.isCancelled()) return;
@ -59,12 +59,14 @@ public class CmdFactionsUnclaim extends FCommand
}
}
BoardOld.removeAt(flocation);
SpoutFeatures.updateTerritoryDisplayLoc(flocation);
BoardColl.get().removeAt(chunk);
SpoutFeatures.updateTerritoryDisplayLoc(chunk);
myFaction.msg("%s<i> unclaimed some land.", fme.describeTo(myFaction, true));
if (ConfServer.logLandUnclaims)
Factions.get().log(fme.getName()+" unclaimed land at ("+flocation.getCoordString()+") from the faction: "+otherFaction.getTag());
{
Factions.get().log(fme.getName()+" unclaimed land at ("+chunk.getChunkX()+","+chunk.getChunkZ()+") from the faction: "+otherFaction.getTag());
}
}
}

8
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.BoardOld;
import com.massivecraft.factions.BoardColl;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
@ -46,15 +46,17 @@ public class CmdFactionsUnclaimall extends FCommand
}
LandUnclaimAllEvent unclaimAllEvent = new LandUnclaimAllEvent(myFaction, fme);
Bukkit.getServer().getPluginManager().callEvent(unclaimAllEvent);
Bukkit.getServer().getPluginManager().callEvent(unclaimAllEvent);
// this event cannot be cancelled
BoardOld.unclaimAll(myFaction.getId());
BoardColl.get().removeAll(myFaction);
myFaction.msg("%s<i> unclaimed ALL of your faction's land.", fme.describeTo(myFaction, true));
SpoutFeatures.updateTerritoryDisplayLoc(null);
if (ConfServer.logLandUnclaims)
{
Factions.get().log(fme.getName()+" unclaimed everything for the faction: "+myFaction.getTag());
}
}
}