Update to Minecraft 1.19

By: md_5 <git@md-5.net>
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions
--- a/paper-server/nms-patches/net/minecraft/server/MinecraftServer.patch
+++ b/paper-server/nms-patches/net/minecraft/server/MinecraftServer.patch
@@ -1,12 +1,13 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -163,6 +163,26 @@
+@@ -158,6 +158,28 @@
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 
 +// CraftBukkit start
 +import com.mojang.serialization.DynamicOps;
 +import com.mojang.serialization.Lifecycle;
+import java.util.Random;
 +import jline.console.ConsoleReader;
 +import joptsimple.OptionSet;
 +import net.minecraft.nbt.DynamicOpsNBT;
@@ -16,6 +17,7 @@
 +import net.minecraft.util.datafix.DataConverterRegistry;
 +import net.minecraft.world.level.biome.WorldChunkManager;
 +import net.minecraft.world.level.levelgen.ChunkGeneratorAbstract;
+import net.minecraft.world.level.levelgen.presets.WorldPresets;
 +import net.minecraft.world.level.storage.WorldDataServer;
 +import org.bukkit.Bukkit;
 +import org.bukkit.craftbukkit.CraftServer;
@@ -27,7 +29,7 @@
 public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements ICommandListener, AutoCloseable {
 
     public static final Logger LOGGER = LogUtils.getLogger();
-@@ -255,6 +275,21 @@
+@@ -240,6 +262,21 @@
     protected SaveData worldData;
     private volatile boolean isSaving;
 
@@ -49,7 +51,7 @@
     public static <S extends MinecraftServer> S spin(Function<Thread, S> function) {
         AtomicReference<S> atomicreference = new AtomicReference();
         Thread thread = new Thread(() -> {
-@@ -268,14 +303,14 @@
+@@ -253,14 +290,14 @@
             thread.setPriority(8);
         }
 
@@ -61,24 +63,33 @@
         return s0;
     }
 
-    public MinecraftServer(Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, @Nullable MinecraftSessionService minecraftsessionservice, @Nullable GameProfileRepository gameprofilerepository, @Nullable UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory) {
-+    public MinecraftServer(OptionSet options, DataPackConfiguration datapackconfiguration, DynamicOps<NBTBase> registryreadops, Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, @Nullable MinecraftSessionService minecraftsessionservice, @Nullable GameProfileRepository gameprofilerepository, @Nullable UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory) {
+-    public MinecraftServer(Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) {
+    public MinecraftServer(OptionSet options, DataPackConfiguration datapackconfiguration, DynamicOps<NBTBase> registryreadops, Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) {
         super("Server");
         this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
         this.profiler = this.metricsRecorder.getProfiler();
-@@ -287,7 +322,7 @@
+@@ -272,7 +309,7 @@
         this.status = new ServerPing();
-         this.random = new Random();
+         this.random = RandomSource.create();
         this.port = -1;
 -        this.levels = Maps.newLinkedHashMap();
 +        this.levels = Maps.newLinkedHashMap(); // CraftBukkit - keep order, k+v already use identity methods
         this.running = true;
         this.tickTimes = new long[100];
-         this.resourcePack = "";
-@@ -317,13 +352,41 @@
-         this.structureManager = new DefinedStructureManager(worldstem.resourceManager(), convertable_conversionsession, datafixer);
-         this.serverThread = thread;
-         this.executor = SystemUtils.backgroundExecutor();
+         this.nextTickTime = SystemUtils.getMillis();
+@@ -281,7 +318,7 @@
+         this.frameTimer = new CircularTimer();
+         this.registryHolder = worldstem.registryAccess();
+         this.worldData = worldstem.worldData();
+-        if (!this.worldData.worldGenSettings().dimensions().containsKey(WorldDimension.OVERWORLD)) {
+        if (false && !this.worldData.worldGenSettings().dimensions().containsKey(WorldDimension.OVERWORLD)) { // CraftBukkit - initialised later
+             throw new IllegalStateException("Missing Overworld dimension data");
+         } else {
+             this.proxy = proxy;
+@@ -302,13 +339,41 @@
+             this.serverThread = thread;
+             this.executor = SystemUtils.backgroundExecutor();
+         }
 +        // CraftBukkit start
 +        this.options = options;
 +        this.datapackconfiguration = datapackconfiguration;
@@ -118,7 +129,7 @@
         ScoreboardServer scoreboardserver1 = this.getScoreboard();
 
         Objects.requireNonNull(scoreboardserver1);
-@@ -332,7 +395,7 @@
+@@ -317,7 +382,7 @@
 
     protected abstract boolean initServer() throws IOException;
 
@@ -127,11 +138,10 @@
         if (!JvmProfiler.INSTANCE.isRunning()) {
             ;
         }
-@@ -340,13 +403,8 @@
+@@ -325,12 +390,8 @@
         boolean flag = false;
         ProfiledDuration profiledduration = JvmProfiler.INSTANCE.onWorldLoadedStarted();
 
-        this.detectBundledResources();
 -        this.worldData.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
 -        WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
 +        loadWorld0(s); // CraftBukkit
@@ -142,7 +152,7 @@
         if (profiledduration != null) {
             profiledduration.finish();
         }
-@@ -361,36 +419,206 @@
+@@ -345,25 +406,189 @@
 
     }
 
@@ -158,7 +168,7 @@
 +
 +            if (this.isDemo()) {
 +                worldsettings = MinecraftServer.DEMO_SETTINGS;
-+                generatorsettings = GeneratorSettings.demoSettings(iregistrycustom_dimension);
+                generatorsettings = WorldPresets.demoSettings(iregistrycustom_dimension);
 +            } else {
 +                DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
 
@@ -171,23 +181,14 @@
 -        List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
 -        IRegistry<WorldDimension> iregistry = generatorsettings.dimensions();
 -        WorldDimension worlddimension = (WorldDimension) iregistry.get(WorldDimension.OVERWORLD);
-        Holder holder;
-        Object object;
-
-        if (worlddimension == null) {
-            holder = this.registryAccess().registryOrThrow(IRegistry.DIMENSION_TYPE_REGISTRY).getOrCreateHolder(DimensionManager.OVERWORLD_LOCATION);
-            object = GeneratorSettings.makeDefaultOverworld(this.registryAccess(), (new Random()).nextLong());
-        } else {
-            holder = worlddimension.typeHolder();
-            object = worlddimension.generator();
+-        WorldServer worldserver = new WorldServer(this, this.executor, this.storageSource, iworlddataserver, World.OVERWORLD, worlddimension, worldloadlistener, flag, j, list, true);
 +                worldsettings = new WorldSettings(dedicatedserverproperties.levelName, dedicatedserverproperties.gamemode, dedicatedserverproperties.hardcore, dedicatedserverproperties.difficulty, false, new GameRules(), datapackconfiguration);
 +                generatorsettings = options.has("bonusChest") ? dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension).withBonusChest() : dedicatedserverproperties.getWorldGenSettings(iregistrycustom_dimension);
 +            }
 +
 +            overworldData = new WorldDataServer(worldsettings, generatorsettings, Lifecycle.stable());
-         }
- 
-        WorldServer worldserver = new WorldServer(this, this.executor, this.storageSource, iworlddataserver, World.OVERWORLD, holder, worldloadlistener, (ChunkGenerator) object, flag, j, list, true);
+        }
+
 +        GeneratorSettings overworldSettings = overworldData.worldGenSettings();
 +        IRegistry<WorldDimension> iregistry = overworldSettings.dimensions();
 +        for (WorldDimension worldDimension : iregistry) {
@@ -248,9 +249,7 @@
 +                        MinecraftServer.LOGGER.info("---- Migration of old " + worldType + " folder failed ----");
 +                    }
 +                }
- 
-        this.levels.put(World.OVERWORLD, worldserver);
-        WorldPersistentData worldpersistentdata = worldserver.getDataStorage();
+
 +                try {
 +                    worldSession = Convertable.createDefault(server.getWorldContainer().toPath()).createAccess(name, dimensionKey);
 +                } catch (IOException ex) {
@@ -268,7 +267,7 @@
 +
 +                if (this.isDemo()) {
 +                    worldsettings = MinecraftServer.DEMO_SETTINGS;
-+                    generatorsettings = GeneratorSettings.demoSettings(iregistrycustom_dimension);
+                    generatorsettings = WorldPresets.demoSettings(iregistrycustom_dimension);
 +                } else {
 +                    DedicatedServerProperties dedicatedserverproperties = ((DedicatedServer) this).getProperties();
 +
@@ -285,36 +284,19 @@
 +                }, worlddata.worldGenSettings());
 +            }
 +
-+            IWorldDataServer iworlddataserver = worlddata;
+            WorldDataServer iworlddataserver = worlddata;
 +            GeneratorSettings generatorsettings = worlddata.worldGenSettings();
 +            boolean flag = generatorsettings.isDebug();
 +            long i = generatorsettings.seed();
 +            long j = BiomeManager.obfuscateSeed(i);
 +            List<MobSpawner> list = ImmutableList.of(new MobSpawnerPhantom(), new MobSpawnerPatrol(), new MobSpawnerCat(), new VillageSiege(), new MobSpawnerTrader(iworlddataserver));
 +            WorldDimension worlddimension = (WorldDimension) iregistry.get(dimensionKey);
-+            Holder<DimensionManager> holder;
-+            ChunkGenerator chunkgenerator;
 +
-+            if (worlddimension == null) {
-+                holder = this.registryAccess().registryOrThrow(IRegistry.DIMENSION_TYPE_REGISTRY).getOrCreateHolder(DimensionManager.OVERWORLD_LOCATION);
-+                chunkgenerator = GeneratorSettings.makeDefaultOverworld(this.registryHolder, (new Random()).nextLong());
-+            } else {
-+                holder = worlddimension.typeHolder();
-+                chunkgenerator = worlddimension.generator();
-+            }
-+
-+            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), holder.value());
+            org.bukkit.generator.WorldInfo worldInfo = new org.bukkit.craftbukkit.generator.CraftWorldInfo(iworlddataserver, worldSession, org.bukkit.World.Environment.getEnvironment(dimension), worlddimension.typeHolder().value());
 +            if (biomeProvider == null && gen != null) {
 +                biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
 +            }
 +
-+            if (biomeProvider != null) {
-+                WorldChunkManager worldChunkManager = new CustomWorldChunkManager(worldInfo, biomeProvider, registryHolder.ownedRegistryOrThrow(IRegistry.BIOME_REGISTRY));
-+                if (chunkgenerator instanceof ChunkGeneratorAbstract cga) {
-+                    chunkgenerator = new ChunkGeneratorAbstract(cga.structureSets, cga.noises, worldChunkManager, chunkgenerator.ringPlacementSeed, cga.settings);
-+                }
-+            }
-+
 +            ResourceKey<World> worldKey = ResourceKey.create(IRegistry.DIMENSION_REGISTRY, dimensionKey.location());
 +
 +            if (dimensionKey == WorldDimension.OVERWORLD) {
@@ -323,24 +305,26 @@
 +
 +                WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
 +
-+                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, holder, worldloadlistener, chunkgenerator, flag, j, list, true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
+                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, list, true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
 +                WorldPersistentData worldpersistentdata = world.getDataStorage();
 +                this.readScoreboard(worldpersistentdata);
 +                this.server.scoreboardManager = new org.bukkit.craftbukkit.scoreboard.CraftScoreboardManager(this, world.getScoreboard());
 +                this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
 +            } else {
 +                WorldLoadListener worldloadlistener = this.progressListenerFactory.create(11);
-+                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, holder, worldloadlistener, chunkgenerator, flag, j, ImmutableList.of(), true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
+                world = new WorldServer(this, this.executor, worldSession, iworlddataserver, worldKey, worlddimension, worldloadlistener, flag, j, ImmutableList.of(), true, org.bukkit.World.Environment.getEnvironment(dimension), gen, biomeProvider);
 +            }
+
+            worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
+            this.initWorld(world, worlddata, worldData, worlddata.worldGenSettings());
+ 
+-        this.levels.put(World.OVERWORLD, worldserver);
+-        WorldPersistentData worldpersistentdata = worldserver.getDataStorage();
+            this.levels.put(world.dimension(), world);
+            this.getPlayerList().addWorldborderListener(world);
 
 -        this.readScoreboard(worldpersistentdata);
 -        this.commandStorage = new PersistentCommandStorage(worldpersistentdata);
-+            worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
-+            this.initWorld(world, worlddata, worldData, worlddata.worldGenSettings());
-+
-+            this.levels.put(world.dimension(), world);
-+            this.getPlayerList().addWorldborderListener(world);
-+
 +            if (worlddata.getCustomBossEvents() != null) {
 +                this.getCustomBossEvents().load(worlddata.getCustomBossEvents());
 +            }
@@ -373,7 +357,7 @@
 
         if (!iworlddataserver.isInitialized()) {
             try {
-@@ -414,31 +642,8 @@
+@@ -387,29 +612,8 @@
             iworlddataserver.setInitialized(true);
         }
 
@@ -390,10 +374,8 @@
 -
 -            if (resourcekey != WorldDimension.OVERWORLD) {
 -                ResourceKey<World> resourcekey1 = ResourceKey.create(IRegistry.DIMENSION_REGISTRY, resourcekey.location());
-                Holder<DimensionManager> holder1 = ((WorldDimension) entry.getValue()).typeHolder();
-                ChunkGenerator chunkgenerator = ((WorldDimension) entry.getValue()).generator();
 -                SecondaryWorldData secondaryworlddata = new SecondaryWorldData(this.worldData, iworlddataserver);
-                WorldServer worldserver1 = new WorldServer(this, this.executor, this.storageSource, secondaryworlddata, resourcekey1, holder1, worldloadlistener, chunkgenerator, flag, j, ImmutableList.of(), false);
+-                WorldServer worldserver1 = new WorldServer(this, this.executor, this.storageSource, secondaryworlddata, resourcekey1, (WorldDimension) entry.getValue(), worldloadlistener, flag, j, ImmutableList.of(), false);
 -
 -                worldborder.addListener(new IWorldBorderListener.a(worldserver1.getWorldBorder()));
 -                this.levels.put(resourcekey1, worldserver1);
@@ -406,10 +388,10 @@
 
     private static void setInitialSpawn(WorldServer worldserver, IWorldDataServer iworlddataserver, boolean flag, boolean flag1) {
         if (flag1) {
-@@ -446,6 +651,21 @@
+@@ -417,6 +621,21 @@
         } else {
-             ChunkGenerator chunkgenerator = worldserver.getChunkSource().getGenerator();
-             ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(chunkgenerator.climateSampler().findSpawnPosition());
+             ChunkProviderServer chunkproviderserver = worldserver.getChunkSource();
+             ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(chunkproviderserver.randomState().sampler().findSpawnPosition());
 +            // CraftBukkit start
 +            if (worldserver.generator != null) {
 +                Random rand = new Random(worldserver.getSeed());
@@ -425,10 +407,10 @@
 +                }
 +            }
 +            // CraftBukkit end
-             int i = chunkgenerator.getSpawnHeight(worldserver);
+             int i = chunkproviderserver.getGenerator().getSpawnHeight(worldserver);
 
             if (i < worldserver.getMinBuildHeight()) {
-@@ -503,8 +723,11 @@
+@@ -474,8 +693,11 @@
         iworlddataserver.setGameType(EnumGamemode.SPECTATOR);
     }
 
@@ -442,7 +424,7 @@
 
         MinecraftServer.LOGGER.info("Preparing start region for dimension {}", worldserver.dimension().location());
         BlockPosition blockposition = worldserver.getSharedSpawnPos();
-@@ -514,19 +737,23 @@
+@@ -485,19 +707,23 @@
 
         chunkproviderserver.getLightEngine().setTaskPerBatch(500);
         this.nextTickTime = SystemUtils.getMillis();
@@ -475,7 +457,7 @@
             ForcedChunk forcedchunk = (ForcedChunk) worldserver1.getDataStorage().get(ForcedChunk::load, "chunks");
 
             if (forcedchunk != null) {
-@@ -541,11 +768,18 @@
+@@ -512,11 +738,18 @@
             }
         }
 
@@ -496,8 +478,8 @@
 +        // CraftBukkit end
     }
 
-     protected void detectBundledResources() {
-@@ -590,12 +824,16 @@
+     public EnumGamemode getDefaultGameType() {
+@@ -546,12 +779,16 @@
             worldserver.save((IProgressUpdate) null, flag1, worldserver.noSave && !flag2);
         }
 
@@ -514,7 +496,7 @@
         if (flag1) {
             Iterator iterator1 = this.getAllLevels().iterator();
 
-@@ -630,8 +868,29 @@
+@@ -586,12 +823,33 @@
         this.stopServer();
     }
 
@@ -535,6 +517,10 @@
 +            hasStopped = true;
 +        }
 +        // CraftBukkit end
+         if (this.metricsRecorder.isRecording()) {
+             this.cancelRecordingMetrics();
+         }
+ 
         MinecraftServer.LOGGER.info("Stopping server");
 +        // CraftBukkit start
 +        if (this.server != null) {
@@ -544,7 +530,7 @@
         if (this.getConnection() != null) {
             this.getConnection().stop();
         }
-@@ -641,6 +900,7 @@
+@@ -601,6 +859,7 @@
             MinecraftServer.LOGGER.info("Saving players");
             this.playerList.saveAll();
             this.playerList.removeAll();
@@ -552,28 +538,28 @@
         }
 
         MinecraftServer.LOGGER.info("Saving worlds");
-@@ -732,9 +992,10 @@
-                 while (this.running) {
-                     long i = SystemUtils.getMillis() - this.nextTickTime;
+@@ -696,9 +955,10 @@
+             while (this.running) {
+                 long i = SystemUtils.getMillis() - this.nextTickTime;
 
-                    if (i > 2000L && this.nextTickTime - this.lastOverloadWarning >= 15000L) {
-+                    if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
-                         long j = i / 50L;
+-                if (i > 2000L && this.nextTickTime - this.lastOverloadWarning >= 15000L) {
+                if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
+                     long j = i / 50L;
 
-+                        if (server.getWarnOnOverload()) // CraftBukkit
-                         MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
-                         this.nextTickTime += j * 50L;
-                         this.lastOverloadWarning = this.nextTickTime;
-@@ -745,6 +1006,7 @@
-                         this.debugCommandProfiler = new MinecraftServer.b(SystemUtils.getNanos(), this.tickCount);
-                     }
+                    if (server.getWarnOnOverload()) // CraftBukkit
+                     MinecraftServer.LOGGER.warn("Can't keep up! Is the server overloaded? Running {}ms or {} ticks behind", i, j);
+                     this.nextTickTime += j * 50L;
+                     this.lastOverloadWarning = this.nextTickTime;
+@@ -709,6 +969,7 @@
+                     this.debugCommandProfiler = new MinecraftServer.TimeProfiler(SystemUtils.getNanos(), this.tickCount);
+                 }
 
-+                    MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
-                     this.nextTickTime += 50L;
-                     this.startMetricsRecordingTick();
-                     this.profiler.push("tick");
-@@ -789,6 +1051,12 @@
-                     this.profileCache.clearExecutor();
+                MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
+                 this.nextTickTime += 50L;
+                 this.startMetricsRecordingTick();
+                 this.profiler.push("tick");
+@@ -750,6 +1011,12 @@
+                     this.services.profileCache().clearExecutor();
                 }
 
 +                // CraftBukkit start - Restore terminal to original settings
@@ -585,7 +571,7 @@
                 this.onServerExit();
             }
 
-@@ -822,8 +1090,15 @@
+@@ -783,8 +1050,15 @@
     }
 
     private boolean haveTime() {
@@ -602,7 +588,7 @@
 
     protected void waitUntilNextTick() {
         this.runAllTasks();
-@@ -869,7 +1144,7 @@
+@@ -830,7 +1104,7 @@
         }
     }
 
@@ -611,7 +597,7 @@
         this.getProfiler().incrementCounter("runTask");
         super.doRunTask(ticktask);
     }
-@@ -940,7 +1215,7 @@
+@@ -901,7 +1175,7 @@
             }
         }
 
@@ -620,7 +606,7 @@
             MinecraftServer.LOGGER.debug("Autosave started");
             this.profiler.push("save");
             this.saveEverything(true, false, false);
-@@ -959,22 +1234,39 @@
+@@ -920,22 +1194,39 @@
     }
 
     public void tickChildren(BooleanSupplier booleansupplier) {
@@ -660,7 +646,7 @@
 
             this.profiler.push("tick");
 
-@@ -1063,7 +1355,7 @@
+@@ -1024,7 +1315,7 @@
 
     @DontObfuscate
     public String getServerModName() {
@@ -669,7 +655,7 @@
     }
 
     public SystemReport fillSystemReport(SystemReport systemreport) {
-@@ -1406,11 +1698,11 @@
+@@ -1375,11 +1666,11 @@
     public CompletableFuture<Void> reloadResources(Collection<String> collection) {
         IRegistryCustom.Dimension iregistrycustom_dimension = this.registryAccess();
         CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
@@ -683,15 +669,15 @@
         }, this).thenCompose((immutablelist) -> {
             ResourceManager resourcemanager = new ResourceManager(EnumResourcePackType.SERVER_DATA, immutablelist);
 
-@@ -1425,6 +1717,7 @@
-         }).thenAcceptAsync((minecraftserver_a) -> {
+@@ -1394,6 +1685,7 @@
+         }).thenAcceptAsync((minecraftserver_reloadableresources) -> {
             this.resources.close();
-             this.resources = minecraftserver_a;
+             this.resources = minecraftserver_reloadableresources;
 +            this.server.syncCommands(); // SPIGOT-5884: Lost on reload
             this.packRepository.setSelected(collection);
             this.worldData.setDataPackConfig(getSelectedPacks(this.packRepository));
             this.resources.managers.updateRegistryTags(this.registryAccess());
-@@ -1774,7 +2067,7 @@
+@@ -1743,7 +2035,7 @@
             try {
                 label51:
                 {
@@ -700,7 +686,7 @@
 
                     try {
                         arraylist = Lists.newArrayList(NativeModuleLister.listModules());
-@@ -1824,6 +2117,22 @@
+@@ -1793,6 +2085,22 @@
 
     }
 
@@ -723,24 +709,3 @@
     private void startMetricsRecordingTick() {
         if (this.willStartRecordingMetrics) {
             this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(SystemUtils.timeSource, this.isDedicatedServer()), SystemUtils.timeSource, SystemUtils.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
-@@ -1935,8 +2244,10 @@
-         }
-     }
- 
-    private static record a(IReloadableResourceManager a, DataPackResources b) implements AutoCloseable {
-+    // CraftBukkit start - decompile error
-+    public static record a(IReloadableResourceManager resourceManager, DataPackResources managers) implements AutoCloseable {
- 
-+        /*
-         final IReloadableResourceManager resourceManager;
-         final DataPackResources managers;
- 
-@@ -1944,6 +2255,8 @@
-             this.resourceManager = ireloadableresourcemanager;
-             this.managers = datapackresources;
-         }
-+         */
-+        // CraftBukkit end
- 
-         public void close() {
-             this.resourceManager.close();