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

Don't allow non-entites to damage players in spawn. Fixes #696

Browse Source
This commit is contained in:
cmastudios 2013-10-27 16:10:34 -05:00
parent a039e65a8a
commit 215551ec15
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,11 @@ public class WarEntityListener implements Listener {
Player d = (Player) defender; Player d = (Player) defender;
Warzone defenderWarzone = Warzone.getZoneByPlayerName(d.getName()); Warzone defenderWarzone = Warzone.getZoneByPlayerName(d.getName());
if (d != null && defenderWarzone != null && event.getDamage() >= d.getHealth()) { if (d != null && defenderWarzone != null && event.getDamage() >= d.getHealth()) {
LoadoutSelection defenderLoadoutState = defenderWarzone.getLoadoutSelections().get(d.getName());
if (defenderLoadoutState != null && defenderLoadoutState.isStillInSpawn()) {
event.setCancelled(true);
return;
}
if (defenderWarzone.getReallyDeadFighters().contains(d.getName())) { if (defenderWarzone.getReallyDeadFighters().contains(d.getName())) {
// don't re-kill a dead person // don't re-kill a dead person
if (d.getHealth() != 0) { if (d.getHealth() != 0) {