mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Update CraftBukkit
This commit is contained in:
parent
f2a1235de0
commit
7a921fe094
27 changed files with 2 additions and 22 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 37c79691615fbd28b49c7371a64700e4f5713eca
|
||||
Subproject commit a04b586418538c428d0e464df3e2a1f3b06889fd
|
|
@ -1,20 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <1254957+zachbr@users.noreply.github.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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -0,0 +0,0 @@ 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) {
|
||||
--
|
Loading…
Reference in a new issue