diff options
Diffstat (limited to 'nms-patches/EntityThrownExpBottle.patch')
| -rw-r--r-- | nms-patches/EntityThrownExpBottle.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/EntityThrownExpBottle.patch b/nms-patches/EntityThrownExpBottle.patch index 08b992e7..750bc72d 100644 --- a/nms-patches/EntityThrownExpBottle.patch +++ b/nms-patches/EntityThrownExpBottle.patch @@ -1,15 +1,14 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/EntityThrownExpBottle.java 2014-11-28 17:43:43.169707433 +0000 -+++ src/main/java/net/minecraft/server/EntityThrownExpBottle.java 2014-11-28 17:38:19.000000000 +0000 -@@ -28,8 +28,17 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/EntityThrownExpBottle.java 2015-02-26 22:40:22.707608138 +0000 ++++ src/main/java/net/minecraft/server/EntityThrownExpBottle.java 2015-02-26 22:40:22.707608138 +0000 +@@ -28,9 +28,18 @@ protected void a(MovingObjectPosition movingobjectposition) { - if (!this.world.isStatic) { + if (!this.world.isClientSide) { - this.world.triggerEffect(2002, new BlockPosition(this), 0); -- int i = 3 + this.world.random.nextInt(5) + this.world.random.nextInt(5); + // CraftBukkit - moved to after event + // this.world.triggerEffect(2002, new BlockPosition(this), 0); -+ int i = 3 + this.world.random.nextInt(5) + this.world.random.nextInt(5); -+ + int i = 3 + this.world.random.nextInt(5) + this.world.random.nextInt(5); + + // CraftBukkit start + org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, i); + i = event.getExperience(); @@ -17,6 +16,7 @@ + this.world.triggerEffect(2002, new BlockPosition(this), 0); + } + // CraftBukkit end - ++ while (i > 0) { int j = EntityExperienceOrb.getOrbValue(i); + |