1 files changed, 22 insertions, 0 deletions
diff --git a/patch-remap/og/net/minecraft/world/entity/projectile/EntityThrownExpBottle.patch b/patch-remap/og/net/minecraft/world/entity/projectile/EntityThrownExpBottle.patch
new file mode 100644
index 0000000000..4d2228fa51
--- /dev/null
+++ b/patch-remap/og/net/minecraft/world/entity/projectile/EntityThrownExpBottle.patch
@@ -0,0 +1,22 @@
+--- a/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
++++ b/net/minecraft/world/entity/projectile/EntityThrownExpBottle.java
+@@ -39,9 +39,18 @@
+     protected void onHit(MovingObjectPosition movingobjectposition) {
+         super.onHit(movingobjectposition);
+         if (this.level() instanceof WorldServer) {
+-            this.level().levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
++            // CraftBukkit - moved to after event
++            // this.level().levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
+             int i = 3 + this.level().random.nextInt(5) + this.level().random.nextInt(5);
+ 
++            // CraftBukkit start
++            org.bukkit.event.entity.ExpBottleEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callExpBottleEvent(this, movingobjectposition, i);
++            i = event.getExperience();
++            if (event.getShowEffect()) {
++                this.level().levelEvent(2002, this.blockPosition(), PotionUtil.getColor(Potions.WATER));
++            }
++            // CraftBukkit end
++
+             EntityExperienceOrb.award((WorldServer) this.level(), this.position(), i);
+             this.discard();
+         }