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

Halfway through adding in universe support

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 12:26:13 +02:00
parent de703d3461
commit 9fc75b1fcf
25 changed files with 593 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.cmd.arg.ARFPlayer;
import com.massivecraft.factions.cmd.arg.ARFaction;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.integration.SpoutFeatures;
@ -36,7 +36,7 @@ public class CmdFactionsAccess extends FCommand
type = (type == null) ? "" : type.toLowerCase();
PS chunk = PS.valueOf(me).getChunk(true);
TerritoryAccess territory = BoardColl.get().getTerritoryAccessAt(chunk);
TerritoryAccess territory = BoardColls.get().getTerritoryAccessAt(chunk);
Faction locFaction = territory.getHostFaction();
boolean accessAny = Perm.ACCESS_ANY.has(sender, false);

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

@ -10,7 +10,7 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.FPlayerColl;
import com.massivecraft.factions.entity.Faction;
@ -69,7 +69,7 @@ public class CmdFactionsHome extends FCommand
}
Faction faction = BoardColl.get().getFactionAt(PS.valueOf(me));
Faction faction = BoardColls.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

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

@ -1,13 +1,12 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.mcore.cmd.arg.ARBoolean;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
import com.massivecraft.mcore.ps.PS;
public class CmdFactionsMap extends FCommand
{
public CmdFactionsMap()
@ -49,7 +48,7 @@ public class CmdFactionsMap extends FCommand
public void showMap()
{
sendMessage(BoardColl.get().getMap(myFaction, PS.valueOf(me), fme.getPlayer().getLocation().getYaw()));
sendMessage(BoardColls.get().getMap(myFaction, PS.valueOf(me), fme.getPlayer().getLocation().getYaw()));
}
}

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

@ -1,7 +1,7 @@
package com.massivecraft.factions.cmd;
import com.massivecraft.factions.ConfServer;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.event.FactionsEventLandUnclaim;
@ -29,7 +29,7 @@ public class CmdFactionsUnclaim extends FCommand
{
// Args
PS chunk = PS.valueOf(me).getChunk(true);
Faction otherFaction = BoardColl.get().getFactionAt(chunk);
Faction otherFaction = BoardColls.get().getFactionAt(chunk);
// FPerm
if ( ! FPerm.TERRITORY.has(sender, otherFaction, true)) return;
@ -54,7 +54,7 @@ public class CmdFactionsUnclaim extends FCommand
}
}
BoardColl.get().removeAt(chunk);
BoardColls.get().removeAt(chunk);
SpoutFeatures.updateTerritoryDisplayLoc(chunk);
myFaction.msg("%s<i> unclaimed some land.", fme.describeTo(myFaction, true));

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

@ -5,7 +5,7 @@ import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.event.FactionsEventLandUnclaimAll;
import com.massivecraft.factions.integration.Econ;
@ -45,7 +45,7 @@ public class CmdFactionsUnclaimall extends FCommand
// TODO: this event cannot be cancelled yet.
// Apply
BoardColl.get().removeAll(myFaction);
BoardColls.get().removeAll(myFaction);
// Inform
myFaction.msg("%s<i> unclaimed ALL of your faction's land.", fme.describeTo(myFaction, true));