From b8ab91532da95800af83d0954d0083af91e8fe05 Mon Sep 17 00:00:00 2001 From: Drew Date: Tue, 27 May 2014 22:57:30 -0400 Subject: [PATCH] Fix the battlesign crashing when blocking a DamageSource with no entity --- src/main/java/tconstruct/util/TEventHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 9d383a0d..3dce4910 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -339,7 +339,10 @@ public class TEventHandler else { Entity attacker = source.getEntity(); - attacker.attackEntityFrom(DamageSource.causeThornsDamage(player), event.ammount); + if(attacker != null) + { + attacker.attackEntityFrom(DamageSource.causeThornsDamage(player), event.ammount); + } } } }