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

Spawn protection now only when using respawntimer

Browse Source 
Closes gh-469. CTF stalemates cause by buggy spawn protection are gone.
Woohoo!
This commit is contained in:
taoneill 2012-06-03 23:04:05 -04:00
parent af9d4db788
commit 894791215c
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
war/src/main/java/com/tommytony/war/event/WarEntityListener.java
View File

@ -63,8 +63,6 @@ public class WarEntityListener implements Listener {
Entity attacker = event.getDamager();
Entity defender = event.getEntity();
//DamageCause cause = event.getCause();
//War.war.log(cause.toString(), Level.INFO);
// Maybe an arrow was thrown
if (attacker != null && event.getDamager() instanceof Projectile && ((Projectile)event.getDamager()).getShooter() instanceof Player){
attacker = ((Player)((Projectile)event.getDamager()).getShooter());
@ -81,24 +79,9 @@ public class WarEntityListener implements Listener {
if ((attackerTeam != null && defenderTeam != null && attackerTeam != defenderTeam && attackerWarzone == defenderWarzone)
|| (attackerTeam != null && defenderTeam != null && attacker.getEntityId() == defender.getEntityId())) {
// Make sure one of the players isn't in the spawn
if (defenderTeam.getSpawnVolume().contains(d.getLocation())) { // attacking person in spawn
if (!defenderWarzone.isFlagThief(d.getName())
&& !defenderWarzone.isBombThief(d.getName())) { // thieves can always be attacked
War.war.badMsg(a, "Can't attack a player that's inside his team's spawn.");
event.setCancelled(true);
return;
}
} 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
if (!attackerWarzone.isFlagThief(a.getName())
&& !defenderWarzone.isBombThief(d.getName())) { // thieves can always attack
War.war.badMsg(a, "Can't attack a player from inside your spawn.");
event.setCancelled(true);
return;
}
// Make sure none of them are respawning
} else if (defenderWarzone.isRespawning(d)) {
if (defenderWarzone.isRespawning(d)) {
War.war.badMsg(a, "The target is currently respawning!");
event.setCancelled(true);
return;