From b611830b7eb7fe5495c9dfdde727599a73102934 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Mon, 26 Jun 2023 13:01:53 -0400
Subject: [PATCH] Eliminate need to use platform hook to retrieve server here

---
 .../mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java
index 760ed078..2ec2b70e 100644
--- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java
+++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java
@@ -1,10 +1,11 @@
 package org.embeddedt.modernfix.common.mixin.bugfix.paper_chunk_patches;
 
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkMap;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.thread.BlockableEventLoop;
 import org.embeddedt.modernfix.duck.IPaperChunkHolder;
-import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -23,12 +24,14 @@ import java.util.function.Function;
 public class ChunkMapMixin {
     @Shadow @Final private BlockableEventLoop<Runnable> mainThreadExecutor;
 
+    @Shadow @Final private ServerLevel level;
     private Executor mainInvokingExecutor;
 
     @Inject(method = "<init>", at = @At("RETURN"))
     private void setup(CallbackInfo ci) {
+        MinecraftServer server = this.level.getServer();
         this.mainInvokingExecutor = (runnable) -> {
-            if(ModernFixPlatformHooks.getCurrentServer().isSameThread())
+            if(server.isSameThread())
                 runnable.run();
             else
                 this.mainThreadExecutor.execute(runnable);