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

Config migration for cramming gamerule fix

Browse Source
This commit is contained in:
jmp
2020-12-02 15:04:19 -08:00
parent 7ed791400e
commit 08670a41a7
3 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,22 @@ index 03c95b30d8..3b9b44851c 100644
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 6ab0a51b42..e21ef1bdc6 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -118,6 +118,11 @@ public class PaperConfig {
}
}
+ // Purpur start - public save method for config migration
+ saveConfig();
+ }
+ public static void saveConfig() {
+ // Purpur end
try {
config.save(CONFIG_FILE);
} catch (IOException ex) {
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index fcba187bbd..c1eb8e8679 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -86,7 +102,7 @@ index 59abca0fd2..ca4d260e8f 100644
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000..e83fcc0eff
index 0000000000..0dbd665043
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -145,8 +161,8 @@ index 0000000000..e83fcc0eff
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 6);
+ set("config-version", 6);
+ version = getInt("config-version", 7);
+ set("config-version", 7);
+
+ readConfig(PurpurConfig.class, null);
+ }