Updated Upstream (CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: f992ce60 Fix duplicate datapack reload on /reload Spigot Changes: 9472b09d Rebuild patches
This commit is contained in:
parent
89860077fa
commit
8291fff4ac
32 changed files with 80 additions and 81 deletions
|
@ -689,7 +689,7 @@ index b2083d26e3b239d0f26da77955db6a34b622a1bb..90854842fda0f91ac68c70efbcf8ad9e
|
|||
this.world = new CraftWorld((ServerLevel) this, gen, env);
|
||||
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 22391e541c0289b60372dc2531416947955fc067..6345774687d4158d58be067e968c055f0c4a01bb 100644
|
||||
index 7230982ee15d0584824e25aaad7b1adfe128e59a..933d5bd4b5871af83d2db5b52edac217fdf87188 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -809,6 +809,7 @@ public final class CraftServer implements Server {
|
||||
|
@ -700,7 +700,7 @@ index 22391e541c0289b60372dc2531416947955fc067..6345774687d4158d58be067e968c055f
|
|||
for (ServerLevel world : this.console.getAllLevels()) {
|
||||
world.serverLevelData.setDifficulty(config.difficulty);
|
||||
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
|
||||
@@ -842,6 +843,7 @@ public final class CraftServer implements Server {
|
||||
@@ -842,12 +843,14 @@ public final class CraftServer implements Server {
|
||||
world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
|
||||
}
|
||||
world.spigotConfig.init(); // Spigot
|
||||
|
@ -708,15 +708,14 @@ index 22391e541c0289b60372dc2531416947955fc067..6345774687d4158d58be067e968c055f
|
|||
}
|
||||
|
||||
this.pluginManager.clearPlugins();
|
||||
@@ -849,6 +851,7 @@ public final class CraftServer implements Server {
|
||||
this.resetRecipes();
|
||||
this.commandMap.clearCommands();
|
||||
this.reloadData();
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
+ com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
|
||||
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
|
||||
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
|
||||
|
||||
@@ -2106,4 +2109,35 @@ public final class CraftServer implements Server {
|
||||
@@ -2105,4 +2108,35 @@ public final class CraftServer implements Server {
|
||||
return this.spigot;
|
||||
}
|
||||
// Spigot end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue