From dd5b2d5e3f773d2b8d5e16979d6f47ed5a29ec23 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Tue, 5 Apr 2016 00:36:18 -0500 Subject: [PATCH] Fixed NPE with poison condition effect. --- .../mineplex/minecraft/game/core/condition/ConditionEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java index 74e3f7473..718434d95 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionEffect.java @@ -379,7 +379,7 @@ public class ConditionEffect implements Listener Manager.getDamagerManager().NewDamageEvent(ent, condition.GetSource(), null, DamageCause.CUSTOM, 0.1, false, true, false, - condition.GetSource().getName(), "Poison"); + condition.GetSource() != null ? condition.GetSource().getName() : "The Mighty Defek7", "Poison"); } }