1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java b/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
index 5cbdf721..940da7e9 100644
--- a/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
+++ b/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
@@ -18,13 +18,12 @@ public class EntityDamageSourceIndirect extends EntityDamageSource {
     }
 
     public String getLocalizedDeathMessage(EntityHuman entityhuman) {
-        // CraftBukkit start
-        String source = (this.owner == null) ? "Herobrine" : this.owner.getLocalizedName();
-        return LocaleI18n.get("death." + this.translationIndex, new Object[] { entityhuman.name, source});
+        return LocaleI18n.get("death." + this.translationIndex, new Object[] { entityhuman.name, this.owner == null ? this.r.getLocalizedName() : this.owner.getLocalizedName()});
     }
 
+    // CraftBukkit start
     public Entity getProximateDamageSource() {
         return super.getEntity();
-        // CraftBukkit end
     }
+    // CraftBukkit end
 }