@@ -24,5 +24,11 @@
         String s1 = s + ".item";
 
         return itemstack != null && itemstack.hasName() && LocaleI18n.c(s1) ? new ChatMessage(s1, new Object[] { entityliving.getScoreboardDisplayName(), ichatbasecomponent, itemstack.C()}) : new ChatMessage(s, new Object[] { entityliving.getScoreboardDisplayName(), ichatbasecomponent});
+    }    
+    
+    // CraftBukkit start
+    public Entity getProximateDamageSource() {
+        return super.getEntity();
     }
+    // CraftBukkit end
 }