--- a/net/minecraft/server/EntityThrownExpBottle.java
+++ b/net/minecraft/server/EntityThrownExpBottle.java
@@ -27,9 +27,18 @@
     @Override
     protected void a(MovingObjectPosition movingobjectposition) {
         if (!this.world.isClientSide) {
-            this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.WATER));
+            // CraftBukkit - moved to after event
+            // this.world.triggerEffect(2002, new BlockPosition(this), PotionUtil.a(Potions.WATER));
             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), PotionUtil.a(Potions.WATER));
+            }
+            // CraftBukkit end
+
             while (i > 0) {
                 int j = EntityExperienceOrb.getOrbValue(i);
 
