diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java index 3c35ed5a..f017f574 100644 --- a/src/main/java/carpet/script/CarpetEventServer.java +++ b/src/main/java/carpet/script/CarpetEventServer.java @@ -205,7 +205,15 @@ public class CarpetEventServer if (callList.size() > 0) { List argv = argumentSupplier.get(); // empty for onTickDone - ServerCommandSource source = cmdSourceSupplier.get(); + ServerCommandSource source; + try + { + source = cmdSourceSupplier.get(); + } + catch (NullPointerException noReference) // todo figure out what happens when closing. + { + return; + } String nameCheck = perPlayerDistribution?source.getName():null; assert argv.size() == reqArgs; List fails = new ArrayList<>();