From 446bead0973e776b273f776e32f7981252607da8 Mon Sep 17 00:00:00 2001 From: JoshieGemFinder <79513611+JoshieGemFinder@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:59:06 +1000 Subject: [PATCH 1/2] Update CommandBLEvent.java Replace improper use of BetweenlandsWorldStorage.forWorld with proper use of BetweenlandsWorldStorage.forWorldNullable --- .../java/thebetweenlands/common/command/CommandBLEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/thebetweenlands/common/command/CommandBLEvent.java b/src/main/java/thebetweenlands/common/command/CommandBLEvent.java index 466ef6ad18..12dcec89d7 100644 --- a/src/main/java/thebetweenlands/common/command/CommandBLEvent.java +++ b/src/main/java/thebetweenlands/common/command/CommandBLEvent.java @@ -116,7 +116,7 @@ private void processEventState(ICommandSender sender, ResourceLocation eventName @Override public List getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) { - if (BetweenlandsWorldStorage.forWorld(sender.getEntityWorld()) == null) { + if (BetweenlandsWorldStorage.forWorldNullable(sender.getEntityWorld()) == null) { return Collections.emptyList(); } List completions = null; From d0a406d2b1fbb5c6b66beda85d38f4dc91e06ab5 Mon Sep 17 00:00:00 2001 From: JoshieGemFinder <79513611+JoshieGemFinder@users.noreply.github.com> Date: Mon, 4 Sep 2023 13:01:54 +1000 Subject: [PATCH 2/2] Update EnvironmentEventHandler.java Replace improper usage of BetweenlandsWorldStorage.forWorld --- .../thebetweenlands/common/handler/EnvironmentEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java b/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java index f23b9b49fc..ac96c3edec 100644 --- a/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java +++ b/src/main/java/thebetweenlands/common/handler/EnvironmentEventHandler.java @@ -26,7 +26,7 @@ private EnvironmentEventHandler() { } @SubscribeEvent public static void onWorldTick(WorldTickEvent event) { if(event.phase == Phase.END && !event.world.isRemote) { - BetweenlandsWorldStorage storage = BetweenlandsWorldStorage.forWorld(event.world); + BetweenlandsWorldStorage storage = BetweenlandsWorldStorage.forWorldNullable(event.world); if(storage != null) { BLEnvironmentEventRegistry reg = storage.getEnvironmentEventRegistry();