From 2fbc55d0ddef73241de26fa1b31141904e85121e Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 9 Jan 2018 20:09:46 -0500 Subject: [PATCH] Fixed potential NullPointerException on server loading --- .../src/main/java/net/simon987/npcplugin/HarvesterNPC.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java index 396a8e1..e40d0b6 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java +++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java @@ -48,7 +48,9 @@ public class HarvesterNPC extends NonPlayerCharacter { @Override public void onDeadCallback() { - getFactory().getNpcs().remove(this); + if (getFactory() != null && getFactory().getNpcs() != null) { + getFactory().getNpcs().remove(this); + } GameServer.INSTANCE.getEventDispatcher().dispatch( new ObjectDeathEvent(this, ID));