Paper/CraftBukkit-Patches/0147-Fix-ItemFrame-and-Fireball-EntityDamageByEntityEvent.patch
Zach Brown 7b0c576798 Restructure PaperSpigot as a new set of modules
Allows us much greater control over the Spigot portion of the code
and makes us more "proper"
Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 15:46:54 -05:00

23 Zeilen
893 B
Diff

From f1218c01ac825426a172f3332efc98f204d45707 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Tue, 24 Jun 2014 09:51:05 -0500
Subject: [PATCH] Fix ItemFrame and Fireball EntityDamageByEntityEvent
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c8e3db0..ca201b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -597,7 +597,7 @@ public class CraftEventFactory {
if (event == null) {
return false;
}
- return event.isCancelled() || event.getDamage() == 0;
+ return event.isCancelled();
}
public static PlayerLevelChangeEvent callPlayerLevelChangeEvent(Player player, int oldLevel, int newLevel) {
--
1.9.1