Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-21 14:51:25 +01:00
Code Issues Projects Releases Wiki Activity

Accidentally exiting a warzone != flag/cake cap

Browse Source 
Closes gh-497. Before, getting warpped or dropping out of a warzone
could cause you to auto-cap the flag or the cake. Bad. Players now
simply drop their payload, get respawned and the structures get reset.
Bomb carriers are forced to drop their bomb as well.
This commit is contained in:
taoneill 2012-06-22 20:43:49 -04:00
parent 06d6ae9bdb
commit b2d0a5c355
1 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,9 +429,52 @@ public class WarPlayerListener implements Listener {
playerLoc.getYaw(),
playerLoc.getPitch()));
return;
} else {
// Otherwise, send him to spawn
event.setTo(playerTeam.getTeamSpawn());
// Otherwise, send him to spawn (first make sure he drops his flag/cake/bomb to prevent auto-cap and as punishment)
} else if (playerWarzone.isFlagThief(player.getName())) {
Team victimTeam = playerWarzone.getVictimTeamForFlagThief(player.getName());
// Get player back to spawn
playerWarzone.respawnPlayer(event, playerTeam, player);
playerWarzone.removeFlagThief(player.getName());
// Bring back flag of victim team
victimTeam.getFlagVolume().resetBlocks();
victimTeam.initializeTeamFlag();
for (Team team : playerWarzone.getTeams()) {
team.teamcast(player.getName() + " dropped the " + victimTeam.getName() + " flag!");
}
return;
} else if (playerWarzone.isCakeThief(player.getName())) {
Cake cake = playerWarzone.getCakeForThief(player.getName());
// Get player back to spawn
playerWarzone.respawnPlayer(event, playerTeam, player);
playerWarzone.removeCakeThief(player.getName());
// Bring back cake
cake.getVolume().resetBlocks();
cake.addCakeBlocks();
for (Team team : playerWarzone.getTeams()) {
team.teamcast(player.getName() + " dropped the " + cake.getName() + " cake!");
}
return;
} else if (playerWarzone.isBombThief(player.getName())) {
Bomb bomb = playerWarzone.getBombForThief(player.getName());
// Get player back to spawn
playerWarzone.respawnPlayer(event, playerTeam, player);
playerWarzone.removeBombThief(player.getName());
// Bring back bomb
bomb.getVolume().resetBlocks();
bomb.addBombBlocks();
for (Team team : playerWarzone.getTeams()) {
team.teamcast(player.getName() + " dropped the " + bomb.getName() + " bomb!");
}
return;
}
}