Upstream/Modifyworld
1
0
Fork 0
mirror of https://github.com/PEXPlugins/Modifyworld.git synced 2024-11-16 10:35:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixed ClassCastException caused by wrong entity logics

Browse Source
This commit is contained in:
t3hk0d3 2011-08-02 17:41:38 +04:00
parent 1a056e7fc6
commit 22a4ef1827
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/ru/tehkode/modifyworld/handlers/EntityListener.java
View File

@ -73,24 +73,26 @@ public class EntityListener extends ModifyworldListener {
}
}
player = (Player) edbe.getEntity();
if (edbe.getEntity() instanceof Player && edbe.getDamager() != null) { // Prevent from taking damage by player
if (!canMessWithEntity(player, "modifyworld.damage.take.", edbe.getDamager())) {
cancelDamageEvent(player, event);
return;
if (edbe.getEntity() instanceof Player) {
player = (Player) edbe.getEntity();
if (edbe.getDamager() != null) { // Prevent from taking damage by entity
if (!canMessWithEntity(player, "modifyworld.damage.take.", edbe.getDamager())) {
cancelDamageEvent(player, event);
return;
}
}
if (edbe instanceof EntityDamageByProjectileEvent && edbe.getDamager() == null) { // Prevent damage taken from dipenser projectile
EntityDamageByProjectileEvent edpe = (EntityDamageByProjectileEvent) edbe;
if (!canMessWithEntity(player, "modifyworld.damage.take.", edpe.getProjectile())) {
cancelDamageEvent(player, event);
return;
}
}
}
if (edbe instanceof EntityDamageByProjectileEvent && edbe.getDamager() == null){
EntityDamageByProjectileEvent edpe = (EntityDamageByProjectileEvent)edbe;
if (!canMessWithEntity(player, "modifyworld.damage.take.", edpe.getProjectile())) {
cancelDamageEvent(player, event);
return;
}
}
} else if (event.getEntity() instanceof Player) { // player are been damaged by enviroment
Player player = (Player) event.getEntity();