Skip to content

Commit b611830

Browse files
committed
Eliminate need to use platform hook to retrieve server here
1 parent a6e2fc9 commit b611830

File tree

1 file changed

+5
-2
lines changed
  • common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches

1 file changed

+5
-2
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.embeddedt.modernfix.common.mixin.bugfix.paper_chunk_patches;
22

3+
import net.minecraft.server.MinecraftServer;
34
import net.minecraft.server.level.ChunkHolder;
45
import net.minecraft.server.level.ChunkMap;
6+
import net.minecraft.server.level.ServerLevel;
57
import net.minecraft.util.thread.BlockableEventLoop;
68
import org.embeddedt.modernfix.duck.IPaperChunkHolder;
7-
import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
89
import org.spongepowered.asm.mixin.Final;
910
import org.spongepowered.asm.mixin.Mixin;
1011
import org.spongepowered.asm.mixin.Shadow;
@@ -23,12 +24,14 @@
2324
public class ChunkMapMixin {
2425
@Shadow @Final private BlockableEventLoop<Runnable> mainThreadExecutor;
2526

27+
@Shadow @Final private ServerLevel level;
2628
private Executor mainInvokingExecutor;
2729

2830
@Inject(method = "<init>", at = @At("RETURN"))
2931
private void setup(CallbackInfo ci) {
32+
MinecraftServer server = this.level.getServer();
3033
this.mainInvokingExecutor = (runnable) -> {
31-
if(ModernFixPlatformHooks.getCurrentServer().isSameThread())
34+
if(server.isSameThread())
3235
runnable.run();
3336
else
3437
this.mainThreadExecutor.execute(runnable);

0 commit comments

Comments
 (0)