Fixed NPE when players are killed by (for example) dispensers

1 files changed, 22 insertions, 0 deletions

diff --git a/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java b/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
new file mode 100644
index 00000000..b6d310d3
--- /dev/null
+++ b/src/main/java/net/minecraft/server/EntityDamageSourceIndirect.java
@@ -0,0 +1,22 @@
+package net.minecraft.server;
+
+public class EntityDamageSourceIndirect extends EntityDamageSource {
+
+    private Entity n;
+
+    public EntityDamageSourceIndirect(String s, Entity entity, Entity entity1) {
+        super(s, entity);
+        this.n = entity1;
+    }
+
+    public Entity getEntity() {
+        return this.n;
+    }
+
+    public String a(EntityHuman entityhuman) {
+        // CraftBukkit start
+        String source = (this.n == null) ? "Herobrine" : this.n.Y();
+        return StatisticCollector.a("death." + this.m, new Object[] { entityhuman.name, source});
+        // CraftBukkit end
+    }
+}
\ No newline at end of file