Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-01-12 03:13:40 +01:00
Code Issues Projects Releases Wiki Activity

Fixed suffocation disable option.

Browse Source
This commit is contained in:
sk89q 2011-02-02 21:03:33 -08:00
parent a31378c2c8
commit b379b8f022
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -66,6 +66,11 @@ public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
event.setCancelled(true);
return;
}
if (plugin.disableContactDamage && type == DamageCause.CONTACT) {
event.setCancelled(true);
return;
}
}
}
@ -190,11 +195,6 @@ public void onEntityDamage(EntityDamageEvent event) {
return;
}
if (plugin.disableContactDamage && type == DamageCause.CONTACT) {
event.setCancelled(true);
return;
}
if (type == DamageCause.DROWNING
&& plugin.amphibiousPlayers.contains(player.getName())) {
event.setCancelled(true);