Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-11-13 05:54:31 +01:00
Code Issues Projects Releases Wiki Activity

Let flag carrier into the spawn when we should

Browse Source 
Broke this two commits ago.
This commit is contained in:
taoneill 2012-06-20 23:58:47 -04:00
parent 4835d0f37d
commit c6e98769e5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
View File

@ -437,6 +437,7 @@ public class WarPlayerListener implements Listener {
}
LoadoutSelection loadoutSelectionState = playerWarzone.getLoadoutSelections().get(player.getName());
FlagReturn flagReturn = playerTeam.getTeamConfig().resolveFlagReturn();
if (!playerTeam.getSpawnVolume().contains(playerLoc)) {
if (!playerWarzone.isEnoughPlayers()) {
War.war.badMsg(player, "Can't leave spawn until there's a minimum of " + playerWarzone.getWarzoneConfig().getInt(WarzoneConfig.MINPLAYERS)
@ -454,8 +455,11 @@ public class WarPlayerListener implements Listener {
event.setTo(playerTeam.getTeamSpawn());
return;
}
} else if (loadoutSelectionState != null && !loadoutSelectionState.isStillInSpawn()) {
} else if (loadoutSelectionState != null && !loadoutSelectionState.isStillInSpawn()
&& (flagReturn.equals(FlagReturn.BOTH) || flagReturn.equals(FlagReturn.SPAWN))
&& !playerWarzone.isFlagThief(player.getName())) {
// player is in spawn, but has left already: he should NOT be let back in - kick him out gently
// (also, be sure you aren't preventing the flag from being captured)
int diffZ = playerLoc.getBlockZ() - playerTeam.getTeamSpawn().getBlockZ();
int diffX = playerLoc.getBlockX() - playerTeam.getTeamSpawn().getBlockX();