Updated World a Dimension Patches this Fixes Multiverse Loading

Aduhkiss · Aug 23, 2019 · 808ac3e · 808ac3e
1 parent 08589d6
commit 808ac3e
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 74 deletions.
diff --git a/patches/net/minecraft/server/MinecraftServer.java.patch b/patches/net/minecraft/server/MinecraftServer.java.patch
@@ -520,7 +520,7 @@
          int i = 16;
          int j = 4;
          int k = 192;
-@@ -323,45 +428,52 @@
+@@ -323,45 +428,51 @@
          int i1 = 0;
          this.setUserMessage("menu.generatingTerrain");
          int j1 = 0;
@@ -531,8 +531,7 @@
 +        // CraftBukkit start - fire WorldLoadEvent and handle whether or not to keep the spawn in memory
 +        for (int m = 0; m < worldServerList.size(); m++) {
 +            WorldServer worldserver = this.worldServerList.get(m);
-+            MinecraftServer.LOGGER
-+                    .info("Preparing start region for level " + m + " (Seed: " + worldserver.getSeed() + ")");
++            MinecraftServer.LOGGER.info("Preparing start region for level " + m + " (Seed: " + worldserver.getSeed() + ")");
 
 -        for (int l1 = -192; l1 <= 192 && this.isServerRunning(); l1 += 16)
 -        {
@@ -600,7 +599,7 @@
          }
      }
 
-@@ -379,73 +491,79 @@
+@@ -379,73 +490,79 @@
 
      public abstract boolean shouldBroadcastConsoleToOps();
 
@@ -712,7 +711,7 @@
              {
                  if (worldserver1 != null)
                  {
-@@ -453,159 +571,215 @@
+@@ -453,159 +570,215 @@
                      worldserver1.flush();
                  }
              }
@@ -1002,7 +1001,7 @@
                  BufferedImage bufferedimage = ImageIO.read(file1);
                  Validate.validState(bufferedimage.getWidth() == 64, "Must be 64 pixels wide");
                  Validate.validState(bufferedimage.getHeight() == 64, "Must be 64 pixels high");
-@@ -613,52 +787,42 @@
+@@ -613,52 +786,42 @@
                  ByteBuf bytebuf1 = Base64.encode(bytebuf);
                  response.setFavicon("data:image/png;base64," + bytebuf1.toString(StandardCharsets.UTF_8));
                  bytebuf1.release(); // Forge: fix MC-122085
@@ -1065,7 +1064,7 @@
              this.startProfiling = false;
              this.profiler.profilingEnabled = true;
              this.profiler.clearProfiling();
-@@ -667,16 +831,15 @@
+@@ -667,16 +830,15 @@
          this.profiler.startSection("root");
          this.updateTimeLightAndEntities();
 
@@ -1087,7 +1086,7 @@
              }
 
              Collections.shuffle(Arrays.asList(agameprofile));
-@@ -684,7 +847,7 @@
+@@ -684,7 +846,7 @@
              this.statusResponse.invalidateJson();
          }
 
@@ -1096,7 +1095,7 @@
          {
              this.profiler.startSection("save");
              this.playerList.saveAllPlayerData();
-@@ -697,95 +860,100 @@
+@@ -697,95 +859,100 @@
          this.profiler.endSection();
          this.profiler.startSection("snooper");
 
@@ -1245,7 +1244,7 @@
          this.profiler.endStartSection("connection");
          this.getNetworkSystem().networkTick();
          this.profiler.endStartSection("players");
-@@ -794,33 +962,30 @@
+@@ -794,33 +961,30 @@
          this.getFunctionManager().update();
          this.profiler.endStartSection("tickables");
 
@@ -1287,7 +1286,7 @@
          LOGGER.warn(msg);
      }
 
-@@ -835,53 +1000,51 @@
+@@ -835,53 +999,51 @@
          return ret;
      }
 
@@ -1365,7 +1364,7 @@
                  }
              });
          }
-@@ -889,145 +1052,115 @@
+@@ -889,145 +1051,115 @@
          return report;
      }
 
@@ -1555,7 +1554,7 @@
                      worldserver1.getWorldInfo().setDifficulty(difficulty);
                      worldserver1.setAllowedSpawnTypes(this.allowSpawnMonsters(), this.canSpawnAnimals);
                  }
-@@ -1035,80 +1168,75 @@
+@@ -1035,80 +1167,75 @@
          }
      }
 
@@ -1665,7 +1664,7 @@
                      ++l;
                  }
              }
-@@ -1117,228 +1245,186 @@
+@@ -1117,228 +1244,186 @@
          playerSnooper.addClientStat("worlds", Integer.valueOf(l));
      }
 
@@ -1942,7 +1941,7 @@
                      return entity;
                  }
              }
-@@ -1347,316 +1433,212 @@
+@@ -1347,316 +1432,212 @@
          return null;
      }