diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 34ec97b745..c77e0336ef 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -7,6 +7,7 @@ import org.bukkit.Server;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.util.Vector;
 
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
 public abstract class CraftEntity implements org.bukkit.entity.Entity {
     protected final CraftServer server;
     protected Entity entity;
+    private EntityDamageEvent lastDamageEvent;
 
     public CraftEntity(final CraftServer server, final Entity entity) {
         this.server = server;
@@ -254,4 +256,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
     public void setFallDistance(float distance) {
         getHandle().fallDistance = distance;
     }
+
+    public void setLastDamageCause(EntityDamageEvent event) {
+        lastDamageEvent = event;
+    }
+
+    public EntityDamageEvent getLastDamageCause() {
+        return lastDamageEvent;
+    }
 }