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

Cake thief can now come back to spawn.

Browse Source 
New can't-re-enter-spawn bump was preventing them from scoring. Oops!
This commit is contained in:
taoneill 2012-06-21 19:59:30 -04:00
parent 53aa9cda52
commit 14d4efea9d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,10 +456,11 @@ public class WarPlayerListener implements Listener {
return; return;
} }
} else if (loadoutSelectionState != null && !loadoutSelectionState.isStillInSpawn() } else if (loadoutSelectionState != null && !loadoutSelectionState.isStillInSpawn()
&& !playerWarzone.isCakeThief(player.getName())
&& (flagReturn.equals(FlagReturn.BOTH) || flagReturn.equals(FlagReturn.SPAWN)) && (flagReturn.equals(FlagReturn.BOTH) || flagReturn.equals(FlagReturn.SPAWN))
&& !playerWarzone.isFlagThief(player.getName())) { && !playerWarzone.isFlagThief(player.getName())) {
// player is in spawn, but has left already: he should NOT be let back in - kick him out gently // 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) // (also, be sure you aren't preventing the flag or cake from being captured)
int diffZ = playerLoc.getBlockZ() - playerTeam.getTeamSpawn().getBlockZ(); int diffZ = playerLoc.getBlockZ() - playerTeam.getTeamSpawn().getBlockZ();
int diffX = playerLoc.getBlockX() - playerTeam.getTeamSpawn().getBlockX(); int diffX = playerLoc.getBlockX() - playerTeam.getTeamSpawn().getBlockX();