diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 6ed29a4..50ad57c 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.avicus</groupId>
   <artifactId>grave</artifactId>
diff --git a/pom.xml b/pom.xml
index 174be50..71ef7e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,119 +1,119 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>net.avicus</groupId>
-    <artifactId>grave</artifactId>
-    <version>1.8-SNAPSHOT</version>
+  <groupId>net.avicus</groupId>
+  <artifactId>grave</artifactId>
+  <version>1.8-SNAPSHOT</version>
 
-    <properties>
-        <plugin.name>Grave</plugin.name>
-        <plugin.mainClass>net.avicus.grave.GravePlugin</plugin.mainClass>
-        <project.description>Track entity and player deaths.</project.description>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+  <properties>
+    <plugin.name>Grave</plugin.name>
+    <plugin.mainClass>net.avicus.grave.GravePlugin</plugin.mainClass>
+    <project.description>Track entity and player deaths.</project.description>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
-    <!-- Version Control -->
-    <scm>
-        <connection>scm:git://github.com/Avicus/Grave.git</connection>
-        <developerConnection>scm:git:ssh://github.com/Avicus/Grave.git</developerConnection>
-        <url>https://github.com/Avicus/Grave</url>
-    </scm>
+  <!-- Version Control -->
+  <scm>
+    <connection>scm:git://github.com/Avicus/Grave.git</connection>
+    <developerConnection>scm:git:ssh://github.com/Avicus/Grave.git</developerConnection>
+    <url>https://github.com/Avicus/Grave</url>
+  </scm>
 
-    <!-- Deployment -->
-    <distributionManagement>
-        <repository>
-            <id>avicus-repo</id>
-            <url>https://repo.avicus.net/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>avicus-repo</id>
-            <url>https://repo.avicus.net/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
+  <!-- Deployment -->
+  <distributionManagement>
+    <repository>
+      <id>avicus-repo</id>
+      <url>https://repo.avicus.net/content/repositories/releases/</url>
+    </repository>
+    <snapshotRepository>
+      <id>avicus-repo</id>
+      <url>https://repo.avicus.net/content/repositories/snapshots/</url>
+    </snapshotRepository>
+  </distributionManagement>
 
-    <repositories>
-        <!-- PaperSpigot -->
-        <repository>
-            <id>avicus-public</id>
-            <url>https://repo.avicus.net/content/groups/public/</url>
-        </repository>
-    </repositories>
+  <repositories>
+    <!-- PaperSpigot -->
+    <repository>
+      <id>avicus-public</id>
+      <url>https://repo.avicus.net/content/groups/public/</url>
+    </repository>
+  </repositories>
 
-    <dependencies>
-        <!-- Lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.6</version>
-            <scope>provided</scope>
-        </dependency>
+  <dependencies>
+    <!-- Lombok -->
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.16.6</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <!-- Magner -->
-        <dependency>
-            <groupId>net.avicus</groupId>
-            <artifactId>magnet-api</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
+    <!-- Magner -->
+    <dependency>
+      <groupId>net.avicus</groupId>
+      <artifactId>magnet-api</artifactId>
+      <version>1.8.8-R0.1-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
 
-        <!-- Joda Time -->
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.9.2</version>
-        </dependency>
+    <!-- Joda Time -->
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.9.2</version>
+    </dependency>
 
-        <!-- Tracker -->
-        <dependency>
-            <groupId>tc.oc</groupId>
-            <artifactId>tracker</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <!-- Tracker -->
+    <dependency>
+      <groupId>tc.oc</groupId>
+      <artifactId>tracker</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 
-    <!-- Build Settings -->
-    <build>
-        <sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
+  <!-- Build Settings -->
+  <build>
+    <sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
 
-        <!-- Resources -->
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources/</directory>
-            </resource>
-        </resources>
+    <!-- Resources -->
+    <resources>
+      <resource>
+        <targetPath>.</targetPath>
+        <filtering>true</filtering>
+        <directory>${basedir}/src/main/resources/</directory>
+      </resource>
+    </resources>
 
-        <plugins>
-            <!-- JAR creation plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
+    <plugins>
+      <!-- JAR creation plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
 
-            <!-- shading -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+      <!-- shading -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/src/main/java/net/avicus/grave/GravePlugin.java b/src/main/java/net/avicus/grave/GravePlugin.java
index e289a07..b1d4f4f 100644
--- a/src/main/java/net/avicus/grave/GravePlugin.java
+++ b/src/main/java/net/avicus/grave/GravePlugin.java
@@ -5,13 +5,14 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class GravePlugin extends JavaPlugin {
-    @Override
-    public void onEnable() {
-        this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);
-    }
 
-    public <T extends Event> T callEvent(T event) {
-        this.getServer().getPluginManager().callEvent(event);
-        return event;
-    }
+  @Override
+  public void onEnable() {
+    this.getServer().getPluginManager().registerEvents(new PlayerListener(this), this);
+  }
+
+  public <T extends Event> T callEvent(T event) {
+    this.getServer().getPluginManager().callEvent(event);
+    return event;
+  }
 }
diff --git a/src/main/java/net/avicus/grave/event/EntityDeathByEntityEvent.java b/src/main/java/net/avicus/grave/event/EntityDeathByEntityEvent.java
index 559ec1b..4a55251 100644
--- a/src/main/java/net/avicus/grave/event/EntityDeathByEntityEvent.java
+++ b/src/main/java/net/avicus/grave/event/EntityDeathByEntityEvent.java
@@ -1,35 +1,35 @@
 package net.avicus.grave.event;
 
+import java.util.List;
 import lombok.ToString;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 import org.joda.time.Instant;
 import tc.oc.tracker.Lifetime;
 
-import java.util.List;
-
 @ToString(callSuper = true)
 public class EntityDeathByEntityEvent<T extends LivingEntity> extends EntityDeathEvent {
-    private final T cause;
 
-    public EntityDeathByEntityEvent(Entity entity, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp, T cause) {
-        super(entity, location, lifetime, time, drops, droppedExp);
-        this.cause = cause;
-    }
+  private final T cause;
+
+  public EntityDeathByEntityEvent(Entity entity, Location location, Lifetime lifetime, Instant time,
+      List<ItemStack> drops, int droppedExp, T cause) {
+    super(entity, location, lifetime, time, drops, droppedExp);
+    this.cause = cause;
+  }
 
-    public T getCause() {
-        return this.cause;
-    }
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
+  public T getCause() {
+    return this.cause;
+  }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
+  public HandlerList getHandlers() {
+    return handlers;
+  }
 }
diff --git a/src/main/java/net/avicus/grave/event/EntityDeathByPlayerEvent.java b/src/main/java/net/avicus/grave/event/EntityDeathByPlayerEvent.java
index a1f9953..e521259 100644
--- a/src/main/java/net/avicus/grave/event/EntityDeathByPlayerEvent.java
+++ b/src/main/java/net/avicus/grave/event/EntityDeathByPlayerEvent.java
@@ -1,28 +1,28 @@
 package net.avicus.grave.event;
 
+import java.util.List;
 import lombok.ToString;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 import org.joda.time.Instant;
 import tc.oc.tracker.Lifetime;
 
-import java.util.List;
-
 @ToString(callSuper = true)
 public class EntityDeathByPlayerEvent extends EntityDeathByEntityEvent<Player> {
-    public EntityDeathByPlayerEvent(Entity entity, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp, Player cause) {
-        super(entity, location, lifetime, time, drops, droppedExp, cause);
-    }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
+  public EntityDeathByPlayerEvent(Entity entity, Location location, Lifetime lifetime, Instant time,
+      List<ItemStack> drops, int droppedExp, Player cause) {
+    super(entity, location, lifetime, time, drops, droppedExp, cause);
+  }
+
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
+  public HandlerList getHandlers() {
+    return handlers;
+  }
 }
diff --git a/src/main/java/net/avicus/grave/event/EntityDeathEvent.java b/src/main/java/net/avicus/grave/event/EntityDeathEvent.java
index d52dbea..27611c2 100644
--- a/src/main/java/net/avicus/grave/event/EntityDeathEvent.java
+++ b/src/main/java/net/avicus/grave/event/EntityDeathEvent.java
@@ -1,5 +1,6 @@
 package net.avicus.grave.event;
 
+import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -11,34 +12,40 @@
 import org.joda.time.Instant;
 import tc.oc.tracker.Lifetime;
 
-import java.util.List;
-
 @ToString(callSuper = true)
 public class EntityDeathEvent extends EntityEvent {
-    @Getter private final Location location;
-    @Getter private final Lifetime lifetime;
-    @Getter private final Instant time;
-    @Getter @Setter private List<ItemStack> drops;
-    @Getter @Setter private int droppedExp;
-
-    public EntityDeathEvent(Entity entity, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp) {
-        super(entity);
-        this.entity = entity;
-        this.location = location;
-        this.lifetime = lifetime;
-        this.time = time;
-        this.drops = drops;
-        this.droppedExp = droppedExp;
-    }
-
-    protected static final HandlerList handlers = new HandlerList();
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
+  protected static final HandlerList handlers = new HandlerList();
+  @Getter
+  private final Location location;
+  @Getter
+  private final Lifetime lifetime;
+  @Getter
+  private final Instant time;
+  @Getter
+  @Setter
+  private List<ItemStack> drops;
+  @Getter
+  @Setter
+  private int droppedExp;
+
+  public EntityDeathEvent(Entity entity, Location location, Lifetime lifetime, Instant time,
+      List<ItemStack> drops, int droppedExp) {
+    super(entity);
+    this.entity = entity;
+    this.location = location;
+    this.lifetime = lifetime;
+    this.time = time;
+    this.drops = drops;
+    this.droppedExp = droppedExp;
+  }
+
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
+
+  public HandlerList getHandlers() {
+    return handlers;
+  }
 
 }
diff --git a/src/main/java/net/avicus/grave/event/PlayerDeathByEntityEvent.java b/src/main/java/net/avicus/grave/event/PlayerDeathByEntityEvent.java
index 287c20a..ec946a3 100644
--- a/src/main/java/net/avicus/grave/event/PlayerDeathByEntityEvent.java
+++ b/src/main/java/net/avicus/grave/event/PlayerDeathByEntityEvent.java
@@ -1,5 +1,6 @@
 package net.avicus.grave.event;
 
+import java.util.List;
 import lombok.ToString;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
@@ -9,26 +10,26 @@
 import org.joda.time.Instant;
 import tc.oc.tracker.Lifetime;
 
-import java.util.List;
-
 @ToString(callSuper = true)
 public class PlayerDeathByEntityEvent<T extends LivingEntity> extends PlayerDeathEvent {
-    private final T cause;
 
-    public PlayerDeathByEntityEvent(Player player, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp, T cause) {
-        super(player, location, lifetime, time, drops, droppedExp);
-        this.cause = cause;
-    }
+  private final T cause;
+
+  public PlayerDeathByEntityEvent(Player player, Location location, Lifetime lifetime, Instant time,
+      List<ItemStack> drops, int droppedExp, T cause) {
+    super(player, location, lifetime, time, drops, droppedExp);
+    this.cause = cause;
+  }
 
-    public T getCause() {
-        return this.cause;
-    }
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
+  public T getCause() {
+    return this.cause;
+  }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
+  public HandlerList getHandlers() {
+    return handlers;
+  }
 }
diff --git a/src/main/java/net/avicus/grave/event/PlayerDeathByPlayerEvent.java b/src/main/java/net/avicus/grave/event/PlayerDeathByPlayerEvent.java
index 0485969..b887864 100644
--- a/src/main/java/net/avicus/grave/event/PlayerDeathByPlayerEvent.java
+++ b/src/main/java/net/avicus/grave/event/PlayerDeathByPlayerEvent.java
@@ -1,27 +1,27 @@
 package net.avicus.grave.event;
 
+import java.util.List;
 import lombok.ToString;
 import org.bukkit.Location;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.inventory.ItemStack;
 import org.joda.time.Instant;
 import tc.oc.tracker.Lifetime;
 
-import java.util.List;
-
 @ToString(callSuper = true)
 public class PlayerDeathByPlayerEvent extends PlayerDeathByEntityEvent<Player> {
-    public PlayerDeathByPlayerEvent(Player player, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp, Player cause) {
-        super(player, location, lifetime, time, drops, droppedExp, cause);
-    }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
+  public PlayerDeathByPlayerEvent(Player player, Location location, Lifetime lifetime, Instant time,
+      List<ItemStack> drops, int droppedExp, Player cause) {
+    super(player, location, lifetime, time, drops, droppedExp, cause);
+  }
+
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
+  public HandlerList getHandlers() {
+    return handlers;
+  }
 }
diff --git a/src/main/java/net/avicus/grave/event/PlayerDeathEvent.java b/src/main/java/net/avicus/grave/event/PlayerDeathEvent.java
index ae0849c..8c6ca92 100644
--- a/src/main/java/net/avicus/grave/event/PlayerDeathEvent.java
+++ b/src/main/java/net/avicus/grave/event/PlayerDeathEvent.java
@@ -1,32 +1,32 @@
 package net.avicus.grave.event;
 
+import java.util.List;
 import lombok.Getter;
 import lombok.ToString;
 import org.bukkit.Location;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
-import org.bukkit.event.entity.EntityEvent;
 import org.bukkit.inventory.ItemStack;
 import org.joda.time.Instant;
 import tc.oc.tracker.Lifetime;
 
-import java.util.List;
-
 @ToString(callSuper = true)
 public class PlayerDeathEvent extends EntityDeathEvent {
-    @Getter private final Player player;
 
-    public PlayerDeathEvent(Player player, Location location, Lifetime lifetime, Instant time, List<ItemStack> drops, int droppedExp) {
-        super(player, location, lifetime, time, drops, droppedExp);
-        this.player = player;
-    }
+  @Getter
+  private final Player player;
+
+  public PlayerDeathEvent(Player player, Location location, Lifetime lifetime, Instant time,
+      List<ItemStack> drops, int droppedExp) {
+    super(player, location, lifetime, time, drops, droppedExp);
+    this.player = player;
+  }
 
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
 
-    public HandlerList getHandlers() {
-        return handlers;
-    }
+  public HandlerList getHandlers() {
+    return handlers;
+  }
 }
diff --git a/src/main/java/net/avicus/grave/listener/PlayerListener.java b/src/main/java/net/avicus/grave/listener/PlayerListener.java
index 63dc7da..f230ccc 100644
--- a/src/main/java/net/avicus/grave/listener/PlayerListener.java
+++ b/src/main/java/net/avicus/grave/listener/PlayerListener.java
@@ -1,7 +1,14 @@
 package net.avicus.grave.listener;
 
+import java.util.ArrayList;
+import java.util.List;
 import net.avicus.grave.GravePlugin;
-import net.avicus.grave.event.*;
+import net.avicus.grave.event.EntityDeathByEntityEvent;
+import net.avicus.grave.event.EntityDeathByPlayerEvent;
+import net.avicus.grave.event.EntityDeathEvent;
+import net.avicus.grave.event.PlayerDeathByEntityEvent;
+import net.avicus.grave.event.PlayerDeathByPlayerEvent;
+import net.avicus.grave.event.PlayerDeathEvent;
 import org.bukkit.Location;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -12,61 +19,66 @@
 import tc.oc.tracker.Lifetime;
 import tc.oc.tracker.Lifetimes;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class PlayerListener implements Listener {
-    private final GravePlugin grave;
 
-    public PlayerListener(GravePlugin grave) {
-        this.grave = grave;
-    }
-    
-    @EventHandler
-    public void onEntityDeath(org.bukkit.event.entity.EntityDeathEvent event) {
-        LivingEntity entity = event.getEntity();
-        Lifetime lifetime = Lifetimes.getLifetime(entity);
-        Location location = entity.getLocation();
-        Instant time = Instant.now();
+  private final GravePlugin grave;
 
-        EntityDeathEvent call;
+  public PlayerListener(GravePlugin grave) {
+    this.grave = grave;
+  }
 
-        int droppedExp = event.getDroppedExp();
-        List<ItemStack> drops = new ArrayList<>();
-        drops.addAll(event.getDrops());
+  @EventHandler
+  public void onEntityDeath(org.bukkit.event.entity.EntityDeathEvent event) {
+    LivingEntity entity = event.getEntity();
+    Lifetime lifetime = Lifetimes.getLifetime(entity);
+    Location location = entity.getLocation();
+    Instant time = Instant.now();
 
-        // EntityDeathEvent or EntityDeathBy____Event??
-        if (lifetime.getLastDamage() == null || lifetime.getLastDamage().getInfo().getResolvedDamager() == null) {
-            if (entity instanceof Player)
-                call = new PlayerDeathEvent((Player) entity, location, lifetime, time, drops, droppedExp);
-            else
-                call = new EntityDeathEvent(entity, location, lifetime, time, drops, droppedExp);
-        }
-        else {
-            LivingEntity cause = lifetime.getLastDamage().getInfo().getResolvedDamager();
+    EntityDeathEvent call;
+
+    int droppedExp = event.getDroppedExp();
+    List<ItemStack> drops = new ArrayList<>();
+    drops.addAll(event.getDrops());
+
+    // EntityDeathEvent or EntityDeathBy____Event??
+    if (lifetime.getLastDamage() == null
+        || lifetime.getLastDamage().getInfo().getResolvedDamager() == null) {
+      if (entity instanceof Player) {
+        call = new PlayerDeathEvent((Player) entity, location, lifetime, time, drops, droppedExp);
+      } else {
+        call = new EntityDeathEvent(entity, location, lifetime, time, drops, droppedExp);
+      }
+    } else {
+      LivingEntity cause = lifetime.getLastDamage().getInfo().getResolvedDamager();
 
-            if (entity instanceof Player) {
-                if (cause instanceof Player)
-                    call = new PlayerDeathByPlayerEvent((Player) entity, location, lifetime, time, drops, droppedExp, (Player) cause);
-                else
-                    call = new PlayerDeathByEntityEvent<>((Player) entity, location, lifetime, time, drops, droppedExp, cause);
-            }
-            else {
-                if (cause instanceof Player)
-                    call = new EntityDeathByPlayerEvent(entity, location, lifetime, time, drops, droppedExp, (Player) cause);
-                else
-                    call = new EntityDeathByEntityEvent<>(entity, location, lifetime, time, drops, droppedExp, cause);
-            }
+      if (entity instanceof Player) {
+        if (cause instanceof Player) {
+          call = new PlayerDeathByPlayerEvent((Player) entity, location, lifetime, time, drops,
+              droppedExp, (Player) cause);
+        } else {
+          call = new PlayerDeathByEntityEvent<>((Player) entity, location, lifetime, time, drops,
+              droppedExp, cause);
         }
+      } else {
+        if (cause instanceof Player) {
+          call = new EntityDeathByPlayerEvent(entity, location, lifetime, time, drops, droppedExp,
+              (Player) cause);
+        } else {
+          call = new EntityDeathByEntityEvent<>(entity, location, lifetime, time, drops, droppedExp,
+              cause);
+        }
+      }
+    }
 
-        // Call event!
-        grave.callEvent(call);
-        
-        // Apply changes in drops
-        event.getDrops().clear();
-        event.setDroppedExp(call.getDroppedExp());
-        for (ItemStack itemStack : call.getDrops())
-            location.getWorld().dropItemNaturally(location, itemStack);
+    // Call event!
+    grave.callEvent(call);
 
+    // Apply changes in drops
+    event.getDrops().clear();
+    event.setDroppedExp(call.getDroppedExp());
+    for (ItemStack itemStack : call.getDrops()) {
+      location.getWorld().dropItemNaturally(location, itemStack);
     }
+
+  }
 }