2014-11-28 12:23:19 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityThrownExpBottle.java 2014-11-28 11:22:55.990823162 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityThrownExpBottle.java 2014-11-28 11:01:54.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -28,8 +28,17 @@
|
|
|
|
|
|
|
|
|
|
protected void a(MovingObjectPosition movingobjectposition) {
|
|
|
|
|
if (!this.world.isStatic) {
|
|
|
|
|
- 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);
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, i);
|
|
|
|
|
+ i = event.getExperience();
|
|
|
|
|
+ if (event.getShowEffect()) {
|
|
|
|
|
+ this.world.triggerEffect(2002, new BlockPosition(this), 0);
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
|
|
|
|
|
while (i > 0) {
|
|
|
|
|
int j = EntityExperienceOrb.getOrbValue(i);
|
