Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-02 17:09:35 +01:00
Code Issues Projects Releases Wiki Activity

Don't block self-damage if PVP is denied.

Browse Source
This commit is contained in:
sk89q 2014-08-24 14:33:29 -07:00
parent 8570921049
commit f4700ded12
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
View File

@ -379,7 +379,7 @@ public void onDamageEntity(DamageEntityEvent event) {
String what; String what;
/* PVP */ /* PVP */
if (event.getEntity() instanceof Player && (attacker = event.getCause().getFirstPlayer()) != null) { if (event.getEntity() instanceof Player && (attacker = event.getCause().getFirstPlayer()) != null && !attacker.equals(event.getEntity())) {
Player defender = (Player) event.getEntity(); Player defender = (Player) event.getEntity();
canDamage = query.testBuild(target, associable, DefaultFlag.PVP) canDamage = query.testBuild(target, associable, DefaultFlag.PVP)