From 98165f19833c035f220d469bf88e0005284d4173 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 11 Dec 2016 07:39:42 +0000 Subject: [PATCH] Added NPE check at duel destroy instance. --- .../java/com/l2jmobius/gameserver/model/entity/Duel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java index f5d79af440..cffe85e59e 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/entity/Duel.java @@ -215,7 +215,10 @@ public class Duel setFinished(true); playKneelAnimation(); ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndDuelTask(_duel, _duel.checkEndDuelCondition()), 5000); - getDueldInstance().destroy(); + if (getDueldInstance() != null) + { + getDueldInstance().destroy(); + } break; } }