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

Thieves can also be attacked in spawn

Browse Source
This commit is contained in:
TimWolla 2011-05-23 17:47:18 +02:00
parent f475aa0fc9
commit 6fa2d91130
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
View File

@ -70,12 +70,16 @@ public class WarEntityListener extends EntityListener {
&& attackerWarzone == defenderWarzone) {
// Make sure one of the players isn't in the spawn
if(defenderTeam.getSpawnVolume().contains(d.getLocation())) { // attacking person in spawn
war.badMsg(a, "Can't attack a player that's inside his team's spawn.");
event.setCancelled(true);
if(!defenderWarzone.isFlagThief(d.getName())) { // thiefs can always be attacked
war.badMsg(a, "Can't attack a player that's inside his team's spawn.");
event.setCancelled(true);
}
} else if(attackerTeam.getSpawnVolume().contains(a.getLocation()) && !attackerTeam.getSpawnVolume().contains(d.getLocation())) {
// only let a player inside spawn attack an enemy player if that player enters the spawn
war.badMsg(a, "Can't attack a player from inside your spawn.");
event.setCancelled(true);
if(!attackerWarzone.isFlagThief(a.getName())) { // thiefs can always attack
war.badMsg(a, "Can't attack a player from inside your spawn.");
event.setCancelled(true);
}
}
// Detect death, prevent it and respawn the player