From 9ebae278074f1720665a1fabbb787b0bdede6014 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 10 Feb 2021 23:35:59 -0400 Subject: [PATCH 1/2] 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 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<>(); From 23a78521413aa14f3250bdd9ae83d69d7c467719 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 10 Feb 2021 23:36:45 -0400 Subject: [PATCH 2/2] 1.4.26 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index f4f32b80..d62d0bb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G fabric_version=0.29.4+1.16 # Mod Properties - mod_version = 1.4.25 + mod_version = 1.4.26 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 65c074a6..f77a1a2f 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.4.25+v210203"; + public static final String carpetVersion = "1.4.26+v210210"; public static final Logger LOG = LogManager.getLogger("carpet"); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false;