From dd22f604cce5b41f8e6c771b88fce45308cef6fa Mon Sep 17 00:00:00 2001 From: luisc Date: Sat, 15 Jan 2022 22:52:27 -0600 Subject: [PATCH] Compatibility fix for mods that initialize player or worldobj fields as null. --- src/main/java/noppes/npcs/ScriptForgeEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/ScriptForgeEventHandler.java b/src/main/java/noppes/npcs/ScriptForgeEventHandler.java index 4feebb7a0..66959942d 100644 --- a/src/main/java/noppes/npcs/ScriptForgeEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptForgeEventHandler.java @@ -53,7 +53,7 @@ public class ScriptForgeEventHandler { } else if(!(event instanceof TickEvent) || ((TickEvent)event).side != Side.CLIENT) { if (event instanceof PlayerEvent) { PlayerEvent ev = (PlayerEvent) event; - if (!(ev.player.worldObj instanceof WorldServer)) { + if (ev.player == null || !(ev.player.worldObj instanceof WorldServer)) { return; } }