--- a/net/minecraft/server/EntityExperienceOrb.java
+++ b/net/minecraft/server/EntityExperienceOrb.java
@@ -1,6 +1,11 @@
 package net.minecraft.server;
 
 import java.util.Map.Entry;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+// CraftBukkit end
 
 public class EntityExperienceOrb extends Entity {
 
@@ -36,6 +41,7 @@
     @Override
     public void tick() {
         super.tick();
+        EntityHuman prevTarget = this.targetPlayer;// CraftBukkit - store old target
         if (this.d > 0) {
             --this.d;
         }
@@ -72,7 +78,22 @@
             this.targetPlayer = null;
         }
 
-        if (this.targetPlayer != null) {
+        // CraftBukkit start
+        boolean cancelled = false;
+        if (this.targetPlayer != prevTarget) {
+            EntityTargetLivingEntityEvent event = CraftEventFactory.callEntityTargetLivingEvent(this, targetPlayer, (targetPlayer != null) ? EntityTargetEvent.TargetReason.CLOSEST_PLAYER : EntityTargetEvent.TargetReason.FORGOT_TARGET);
+            EntityLiving target = (event.getTarget() == null) ? null : ((org.bukkit.craftbukkit.entity.CraftLivingEntity) event.getTarget()).getHandle();
+            cancelled = event.isCancelled();
+
+            if (cancelled) {
+                targetPlayer = prevTarget;
+            } else {
+                targetPlayer = (target instanceof EntityHuman) ? (EntityHuman) target : null;
+            }
+        }
+
+        if (this.targetPlayer != null && !cancelled) {
+            // CraftBukkit end
             Vec3D vec3d = new Vec3D(this.targetPlayer.locX() - this.locX(), this.targetPlayer.locY() + (double) this.targetPlayer.getHeadHeight() / 2.0D - this.locY(), this.targetPlayer.locZ() - this.locZ());
             double d1 = vec3d.g();
 
@@ -155,13 +176,19 @@
                     if (!itemstack.isEmpty() && itemstack.f()) {
                         int i = Math.min(this.c(this.value), itemstack.getDamage());
 
-                        this.value -= this.b(i);
-                        itemstack.setDamage(itemstack.getDamage() - i);
+                        // CraftBukkit start
+                        org.bukkit.event.player.PlayerItemMendEvent event = CraftEventFactory.callPlayerItemMendEvent(entityhuman, this, itemstack, i);
+                        i = event.getRepairAmount();
+                        if (!event.isCancelled()) {
+                            this.value -= this.b(i);
+                            itemstack.setDamage(itemstack.getDamage() - i);
+                        }
+                        // CraftBukkit end
                     }
                 }
 
                 if (this.value > 0) {
-                    entityhuman.giveExp(this.value);
+                    entityhuman.giveExp(CraftEventFactory.callPlayerExpChangeEvent(entityhuman, this.value).getAmount()); // CraftBukkit - this.value -> event.getAmount()
                 }
 
                 this.die();
@@ -183,6 +210,24 @@
     }
 
     public static int getOrbValue(int i) {
+        // CraftBukkit start
+        if (i > 162670129) return i - 100000;
+        if (i > 81335063) return 81335063;
+        if (i > 40667527) return 40667527;
+        if (i > 20333759) return 20333759;
+        if (i > 10166857) return 10166857;
+        if (i > 5083423) return 5083423;
+        if (i > 2541701) return 2541701;
+        if (i > 1270849) return 1270849;
+        if (i > 635413) return 635413;
+        if (i > 317701) return 317701;
+        if (i > 158849) return 158849;
+        if (i > 79423) return 79423;
+        if (i > 39709) return 39709;
+        if (i > 19853) return 19853;
+        if (i > 9923) return 9923;
+        if (i > 4957) return 4957;
+        // CraftBukkit end
         return i >= 2477 ? 2477 : (i >= 1237 ? 1237 : (i >= 617 ? 617 : (i >= 307 ? 307 : (i >= 149 ? 149 : (i >= 73 ? 73 : (i >= 37 ? 37 : (i >= 17 ? 17 : (i >= 7 ? 7 : (i >= 3 ? 3 : 1)))))))));
     }