Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-03 11:51:10 -05:00
parent f40f91c273
commit ef024e1fcc
14 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0003-Purpur-config-files.patch
View File

@@ -106,10 +106,10 @@ index c2220d5157d3065a256cd17410760c6aedf24987..729d11569e59e78a0fda67697fe9e27a
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, 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 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c5771e5e21d 100644
index a4024cba49bcd2170206c6f1439e081129be3d15..aa9a7cdc4431a803279bb2325e0eaed7579aafd6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -933,6 +933,7 @@ public final class CraftServer implements Server {
@@ -931,6 +931,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -117,7 +117,7 @@ index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c57
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -973,6 +974,7 @@ public final class CraftServer implements Server {
@@ -971,6 +972,7 @@ public final class CraftServer implements Server {
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
@@ -125,7 +125,7 @@ index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c57
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -988,6 +990,7 @@ public final class CraftServer implements Server {
@@ -986,6 +988,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -133,7 +133,7 @@ index 5f9b87bb36a56ea457f7819c1df9c87661f781c5..f4df373b5b7006b476bf0beaf57a3c57
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2550,6 +2553,18 @@ public final class CraftServer implements Server {
@@ -2547,6 +2550,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}