From 2b5e51b4df73eebe513bb40407a532ea6cc0843d Mon Sep 17 00:00:00 2001
From: replaceitem <40722305+replaceitem@users.noreply.github.com>
Date: Sun, 16 Oct 2022 17:33:54 +0200
Subject: [PATCH] Fixed NPE when events are triggered within events (#1574)

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

diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java
index 09182d38..f37b411c 100644
--- a/src/main/java/carpet/script/CarpetEventServer.java
+++ b/src/main/java/carpet/script/CarpetEventServer.java
@@ -223,7 +223,7 @@ public class CarpetEventServer
         {
             if (callList.size() > 0 && CarpetServer.scriptServer != null)
             {
-                return CarpetServer.scriptServer.events.handleEvents.runIfEnabled( () -> {
+                Boolean isCancelled = CarpetServer.scriptServer.events.handleEvents.runIfEnabled( () -> {
                     CarpetProfiler.ProfilerToken currentSection = CarpetProfiler.start_section(null, "Scarpet events", CarpetProfiler.TYPE.GENERAL);
                     List<Value> argv = argumentSupplier.get(); // empty for onTickDone
                     CommandSourceStack source;
@@ -266,6 +266,7 @@ public class CarpetEventServer
                     CarpetProfiler.end_current_section(currentSection);
                     return cancelled;
                 });
+                return isCancelled != null && isCancelled;
             }
             return false;
         }