From 9ebae278074f1720665a1fabbb787b0bdede6014 Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 10 Feb 2021 23:35:59 -0400
Subject: [PATCH] workaround for hanging events after shutdown.

---
 src/main/java/carpet/script/CarpetEventServer.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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<Value> 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<Callback> fails = new ArrayList<>();