Merge pull request #401 from RoboMWM/patch-1

Compatibility with other plugins' explosions; resolves #400
This commit is contained in:
OmniCypher 2016-02-14 12:30:04 -08:00
commit 27a658affe

View file

@ -444,12 +444,6 @@ public class PKListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
if (event.getCause().equals(DamageCause.BLOCK_EXPLOSION)) {
if (event.getDamager() == null) {
event.setCancelled(true);
}
}
if (event.getDamager() != null) {
if (LavaSurgeWave.isBlockInWave(event.getDamager())) {
event.setCancelled(true);