From ff6c58d83d0b1296ca3652e5ce8ad6019c941142 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 11 Jul 2014 14:04:32 +0100 Subject: [PATCH] Fix null pointer when a skeleton shoots an item frame --- ...-when-a-skeleton-shoots-an-item-fram.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 CraftBukkit-Patches/0160-Fix-null-pointer-when-a-skeleton-shoots-an-item-fram.patch diff --git a/CraftBukkit-Patches/0160-Fix-null-pointer-when-a-skeleton-shoots-an-item-fram.patch b/CraftBukkit-Patches/0160-Fix-null-pointer-when-a-skeleton-shoots-an-item-fram.patch new file mode 100644 index 00000000..f5d3ac05 --- /dev/null +++ b/CraftBukkit-Patches/0160-Fix-null-pointer-when-a-skeleton-shoots-an-item-fram.patch @@ -0,0 +1,22 @@ +From e920cac71ab53976337d07ef5df4f3e9c82be836 Mon Sep 17 00:00:00 2001 +From: Thinkofdeath +Date: Fri, 11 Jul 2014 14:03:48 +0100 +Subject: [PATCH] Fix null pointer when a skeleton shoots an item frame + + +diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +index 808229b..0841c01 100644 +--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java ++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +@@ -587,7 +587,7 @@ public class CraftEventFactory { + if (entity instanceof EntityEnderCrystal && !(source instanceof EntityDamageSource)) { + return false; + } +- EntityDamageEvent event = handleEntityDamageEvent(entity, source, new EnumMap(ImmutableMap.of(DamageModifier.BASE, (double) damage)), null); ++ EntityDamageEvent event = handleEntityDamageEvent(entity, source, new EnumMap(ImmutableMap.of(DamageModifier.BASE, (double) damage)), new EnumMap>(ImmutableMap.of(DamageModifier.BASE, ZERO))); + if (event == null) { + return false; + } +-- +1.9.1 +