Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle null targets in target event. Fixes BUKKIT-5635

Browse Source
This commit is contained in:
Travis Watkins
2014-05-26 19:28:11 -05:00
parent 3fbf4d3b5f
commit 38fbe60d46
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityIronGolem.java
View File

@@ -64,7 +64,11 @@ public class EntityIronGolem extends EntityGolem {
// CraftBukkit start
org.bukkit.event.entity.EntityTargetLivingEntityEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTargetLivingEvent(this, (EntityLiving) entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.COLLISION);
if (!event.isCancelled()) {
this.setGoalTarget(((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle());
if (event.getTarget() == null) {
this.setGoalTarget(null);
} else {
this.setGoalTarget(((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle());
}
}
// CraftBukkit end
}