Fix the usage location error of KeepSpawnInMemory

MohistMC · Apr 13, 2024 · cb52805 · cb52805
1 parent d1829e0
commit cb52805
Showing 1 changed file with 27 additions and 22 deletions.
diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
@@ -306,41 +306,46 @@
        ServerChunkProvider serverchunkprovider = serverworld.func_72863_F();
        serverchunkprovider.func_212863_j_().func_215598_a(500);
        this.field_211151_aa = Util.func_211177_b();
--      serverchunkprovider.func_217228_a(TicketType.field_219488_a, new ChunkPos(blockpos), 11, Unit.INSTANCE);
+       serverchunkprovider.func_217228_a(TicketType.field_219488_a, new ChunkPos(blockpos), 11, Unit.INSTANCE);
 -
 -      while(serverchunkprovider.func_217229_b() != 441) {
 -         this.field_211151_aa = Util.func_211177_b() + 10L;
 -         this.func_213202_o();
-+      if (serverworld.getWorld().getKeepSpawnInMemory()) {
-+         serverchunkprovider.func_217228_a(TicketType.field_219488_a, new ChunkPos(blockpos), 11, Unit.INSTANCE);
-+         while (serverchunkprovider.func_217229_b() < 441) {
-+            // CraftBukkit start
-+            this.executeModerately();
-+            // CraftBukkit end
-+         }
++      while (serverchunkprovider.func_217229_b() < 441) {
++         // CraftBukkit start
++         this.executeModerately();
++         // CraftBukkit end
        }
 
 -      this.field_211151_aa = Util.func_211177_b() + 10L;
 -      this.func_213202_o();
-+      // CraftBukkit start
-+      //this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
-+      this.executeModerately();
-+      if (true) {
-+         ForcedChunksSaveData forcedchunkssavedata = serverworld.func_217481_x().func_215753_b(ForcedChunksSaveData::new, "chunks");
-
+-
 -      for(ServerWorld serverworld1 : this.field_71305_c.values()) {
 -         ForcedChunksSaveData forcedchunkssavedata = serverworld1.func_217481_x().func_215753_b(ForcedChunksSaveData::new, "chunks");
-          if (forcedchunkssavedata != null) {
-             LongIterator longiterator = forcedchunkssavedata.func_212438_a().iterator();
- 
+-         if (forcedchunkssavedata != null) {
+-            LongIterator longiterator = forcedchunkssavedata.func_212438_a().iterator();
+-
 -            while(longiterator.hasNext()) {
-+            while (longiterator.hasNext()) {
-                long i = longiterator.nextLong();
-                ChunkPos chunkpos = new ChunkPos(i);
+-               long i = longiterator.nextLong();
+-               ChunkPos chunkpos = new ChunkPos(i);
 -               serverworld1.func_72863_F().func_217206_a(chunkpos, true);
-+               serverworld.func_72863_F().func_217206_a(chunkpos, true);
++      // CraftBukkit start
++      //this.nextTick = SystemUtils.getMonotonicMillis() + 10L;
++      this.executeModerately();
++      for (ServerWorld serverLevel : this.field_71305_c.values()) {
++         if (serverLevel.getWorld().getKeepSpawnInMemory()) {
++            ForcedChunksSaveData forcedchunkssavedata = serverworld.func_217481_x().func_215753_b(ForcedChunksSaveData::new, "chunks");
++
++            if (forcedchunkssavedata != null) {
++               LongIterator longiterator = forcedchunkssavedata.func_212438_a().iterator();
++
++               while (longiterator.hasNext()) {
++                  long i = longiterator.nextLong();
++                  ChunkPos chunkpos = new ChunkPos(i);
++                  serverworld.func_72863_F().func_217206_a(chunkpos, true);
++               }
++               net.minecraftforge.common.world.ForgeChunkManager.reinstatePersistentChunks(serverworld, forcedchunkssavedata);
              }
-+            net.minecraftforge.common.world.ForgeChunkManager.reinstatePersistentChunks(serverworld, forcedchunkssavedata);
           }
        }