Fix NPE logging death block block.

NerdNu · Feb 12, 2021 · 9b8abbf · 9b8abbf
1 parent 7308364
commit 9b8abbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>nu.nerd</groupId>
 	<artifactId>KitchenSink</artifactId>
 	<name>KitchenSink</name>
-	<version>0.15.0</version>
+	<version>0.15.1</version>
 	<packaging>jar</packaging>
 	<description>A plugin for miscellaneous functionality that hasn't found a home elsewhere.</description>
 	<url>https://github.com/NerdNu/KitchenSink</url>

diff --git a/src/nu/nerd/kitchensink/KitchenSinkListener.java b/src/nu/nerd/kitchensink/KitchenSinkListener.java
@@ -627,7 +627,7 @@ public void catchEntityPreDeath(EntityDamageEvent event) {
         if (event instanceof EntityDamageByBlockEvent) {
             EntityDamageByBlockEvent e = (EntityDamageByBlockEvent) event;
             Block block = e.getDamager();
-            lastDamage = "block " + block.getType().toString() + " ";
+            lastDamage = "block " + (block != null ? block.getType().toString() : "?") + " ";
         } else if (event instanceof EntityDamageByEntityEvent) {
             Entity damager = ((EntityDamageByEntityEvent) event).getDamager();
             if (damager instanceof Projectile) {