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

Bump config version to 10

Browse Source
This commit is contained in:
BillyGalbreath
2020-12-21 01:14:35 -06:00
parent 3d1926e6e0
commit faf0db9183
24 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ index 59abca0fd2330e1cdeda603d4146e4bb1afc3090..ca4d260e8faf852b0986c4cd8645e513
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 0000000000000000000000000000000000000000..025f8bc757bc3f04380d8f4239daef1da092bba1
index 0000000000000000000000000000000000000000..cd3272520eb78a9c663bac3bfdb2b63d611d48a1
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -161,8 +161,8 @@ index 0000000000000000000000000000000000000000..025f8bc757bc3f04380d8f4239daef1d
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 9);
+ set("config-version", 9);
+ version = getInt("config-version", 10);
+ set("config-version", 10);
+
+ readConfig(PurpurConfig.class, null);
+ }

2
patches/server/0006-Barrels-and-enderchests-6-rows.patch
View File

@@ -107,7 +107,7 @@ index a1c3942cbf9a6c0adc4943b05a1c3859c5f0aed6..953741c1cfd9b5c1e0eac80d1e4c7890
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 025f8bc757bc3f04380d8f4239daef1da092bba1..c270af482c466d534870b76193c3fd849f416aa7 100644
index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..1705aefab4c16b3b766152fd81c5fc60bbd8d2e7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;

2
patches/server/0009-AFK-API.patch
View File

@@ -215,7 +215,7 @@ index 800471d450ddcb8d291dc72e93c3d8251cc63248..04578acc532849ef7c93a3515841aa05
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c270af482c466d534870b76193c3fd849f416aa7..f96e8c3175aaeaa63a9b4164b4b047e7053c8581 100644
index 1705aefab4c16b3b766152fd81c5fc60bbd8d2e7..5d22e643f254e9ea52de8725497ff7c54ceb4afd 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@

2
patches/server/0011-Configurable-server-mod-name.patch
View File

@@ -18,7 +18,7 @@ index a8a90679687d680bb26b4fa7c1044f614585c867..5e0f06a254d62acd491ba56371f33914
public CrashReport b(CrashReport crashreport) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f96e8c3175aaeaa63a9b4164b4b047e7053c8581..c81f1c1b0abc76f932125480db20cf1ff115e3b2 100644
index 5d22e643f254e9ea52de8725497ff7c54ceb4afd..36456402ab33c68f2538134a2d11d1d3253808b1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -139,6 +139,11 @@ public class PurpurConfig {

2
patches/server/0013-Lagging-threshold.patch
View File

@@ -25,7 +25,7 @@ index 5e0f06a254d62acd491ba56371f3391423eb64fd..5d8cf545acf231f8f9c037db26f4d29b
}
// Tuinity - replace logic
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c81f1c1b0abc76f932125480db20cf1ff115e3b2..b0a3ab2aa679e0bba7efe42044c49880da7ffa19 100644
index 36456402ab33c68f2538134a2d11d1d3253808b1..e6f8f3ae5810a23aca94cd878343edae345b5ae5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -149,6 +149,11 @@ public class PurpurConfig {

2
patches/server/0021-Alternative-Keepalive-Handling.patch
View File

@@ -68,7 +68,7 @@ index b59e82d8ca3132f448aba892741585406cdc023e..c154c95ebba389290c7e2512e377b1c7
if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) {
int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b0a3ab2aa679e0bba7efe42044c49880da7ffa19..5a0d3403365b06943f5d6bcc517d15c27fb344f1 100644
index e6f8f3ae5810a23aca94cd878343edae345b5ae5..e902d7bc3e2afe273184cc262ab5929cb14ebc88 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -154,6 +154,11 @@ public class PurpurConfig {

2
patches/server/0025-Logger-settings-suppressing-pointless-logs.patch
View File

@@ -17,7 +17,7 @@ index c680319e4040be2b60795b22a5e65d6444cc67ed..eaa1063ff2bc5621e93043c4de41ca62
}
// CraftBukkit end
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 5a0d3403365b06943f5d6bcc517d15c27fb344f1..dafc1ec1c35ea3946aec821b511199a38c072138 100644
index e902d7bc3e2afe273184cc262ab5929cb14ebc88..b37a4b7d27dbc2103b15d97e693675a50a4c1981 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -177,4 +177,11 @@ public class PurpurConfig {

2
patches/server/0034-Dont-send-useless-entity-packets.patch
View File

@@ -61,7 +61,7 @@ index 8e48407fd405ac4c3eece7762b8155c5d0f00fa0..91c4e658230bb8bbce9d0f56db0768a7
protected boolean h;
protected boolean i;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index dafc1ec1c35ea3946aec821b511199a38c072138..6816a42242bc452a6a233aeb0e56808c9204feee 100644
index b37a4b7d27dbc2103b15d97e693675a50a4c1981..7e4136f62e409c03d4d10aaf11526fb685d0701d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -178,6 +178,11 @@ public class PurpurConfig {

2
patches/server/0060-Configurable-TPS-Catchup.patch
View File

@@ -24,7 +24,7 @@ index fe3b76e4ed11f0183731a0dcc39a323ccee3fd2e..2d01bc9c5f95e7bd950a8c9137d1a1ab
this.methodProfiler.exit();
this.methodProfiler.b();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6816a42242bc452a6a233aeb0e56808c9204feee..96bb85cbf621a8a17464042b2b6844eb3b7de78e 100644
index 7e4136f62e409c03d4d10aaf11526fb685d0701d..403148774d880580412888a7c03c11da380149d7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -189,4 +189,9 @@ public class PurpurConfig {

2
patches/server/0082-Add-ping-command.patch
View File

@@ -67,7 +67,7 @@ index 86f1cfe454ea0a989775b49a6b88375c766ef647..da53af61d1171db3c167c6e007adf953
if (!(this.k instanceof EntityPlayer)) {
throw CommandListenerWrapper.a.create();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 96bb85cbf621a8a17464042b2b6844eb3b7de78e..7cf0a74141d01a4ad40e40a14e26a844fc116e90 100644
index 403148774d880580412888a7c03c11da380149d7..98dd496be218ce254fc8d82f132c51ab8cdb918a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,10 +133,12 @@ public class PurpurConfig {

2
patches/server/0088-Add-allow-water-in-end-world-option.patch
View File

@@ -68,7 +68,7 @@ index a8571dae8daefb557a8e3ee39c80ebc3b1b5aad9..7a82a894bb3f737cc80f0b4b8d7a1b25
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 7cf0a74141d01a4ad40e40a14e26a844fc116e90..469bc46bd9dc0a0b40232402ef4a8430ec0b2ea0 100644
index 98dd496be218ce254fc8d82f132c51ab8cdb918a..f0298277336aedd5943e62760753e3a1737c8fa3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,7 +1,6 @@

2
patches/server/0093-Configurable-end-spike-seed.patch
View File

@@ -25,7 +25,7 @@ index 00a1707209b21fc0163960c957864f798da15554..5eb9b3d35e12c2d3dc5f158cbed0b0a0
List<WorldGenEnder.Spike> list = worldgenfeatureendspikeconfiguration.c();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 469bc46bd9dc0a0b40232402ef4a8430ec0b2ea0..a557476905bea929d67a4490ca32a1df4396dcad 100644
index f0298277336aedd5943e62760753e3a1737c8fa3..8d418a2ebc719cf4568bea29e1993c5bf96e6b75 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,5 +1,6 @@

2
patches/server/0094-Configurable-dungeon-seed.patch
View File

@@ -31,7 +31,7 @@ index 07f7b69fefe66ec4f26ca7b4fb3b752e80aeed07..6aa1626f38df0cd8ae8a417dc4fca213
int i = random.nextInt(2) + 2;
int j = -i - 1;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a557476905bea929d67a4490ca32a1df4396dcad..5e9fdafc3bf292f93fe652f0eb7175d65b915703 100644
index 8d418a2ebc719cf4568bea29e1993c5bf96e6b75..698a04682924a374af3ad9668feb4b0f324939e9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -141,10 +141,13 @@ public class PurpurConfig {

2
patches/server/0104-Add-option-to-disable-mushroom-block-updates.patch
View File

@@ -73,7 +73,7 @@ index e8f340b9f2a1e5de9cf7e8cf595de8a806cb528a..3490af6fe0cf2eccac9753778cf4085f
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 5e9fdafc3bf292f93fe652f0eb7175d65b915703..70e105e765163a78786e67c51b1bd13124087b7a 100644
index 698a04682924a374af3ad9668feb4b0f324939e9..3f73dcc02d94d69f5deb6f734cf0a9ec6016bb4c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -200,6 +200,11 @@ public class PurpurConfig {

2
patches/server/0109-Short-enderman-height.patch
View File

@@ -30,7 +30,7 @@ index 37b984a5b6c1c6e146e1c4b0947d1e39a051cfbb..7a35a367a5840fd5df72b0bd64e63019
public static final EntityTypes<EntityEvoker> EVOKER = a("evoker", EntityTypes.Builder.a(EntityEvoker::new, EnumCreatureType.MONSTER).a(0.6F, 1.95F).trackingRange(8));
public static final EntityTypes<EntityEvokerFangs> EVOKER_FANGS = a("evoker_fangs", EntityTypes.Builder.a(EntityEvokerFangs::new, EnumCreatureType.MISC).a(0.5F, 0.8F).trackingRange(6).updateInterval(2));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 70e105e765163a78786e67c51b1bd13124087b7a..02b4a920d1eabd10bd4668e346ff8c93aa178e98 100644
index 3f73dcc02d94d69f5deb6f734cf0a9ec6016bb4c..7854fa516fcb6c00838955c2aa20d73b9181aa90 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -190,6 +190,11 @@ public class PurpurConfig {

2
patches/server/0111-Ridables.patch
View File

@@ -5053,7 +5053,7 @@ index 9d93a8c86b675cf55210724a0b695f960b009d69..bed00077205d3c2d7b2eb67db5af86dd
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 02b4a920d1eabd10bd4668e346ff8c93aa178e98..0c55d2921efd897b575cc5ebbbf0092a078be85d 100644
index 7854fa516fcb6c00838955c2aa20d73b9181aa90..a0d1a45c4dac6e4519231aa3d02939eee3fbd0bc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -134,11 +134,13 @@ public class PurpurConfig {

2
patches/server/0113-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -42,7 +42,7 @@ index 6ef81aeb4c63bc6c23163796dbd977602ca2f540..9ea3c30b679da4e77b86d96d0cc47673
private final GeneratorAccess b;
private final EnumDirection.EnumAxis c;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0c55d2921efd897b575cc5ebbbf0092a078be85d..c9eb69c15cf413bfecd4517be8890de1f3987855 100644
index a0d1a45c4dac6e4519231aa3d02939eee3fbd0bc..a00deb9347b22012b4bd27dfbd85846c49658dcf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -176,6 +176,7 @@ public class PurpurConfig {

2
patches/server/0120-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
View File

@@ -63,7 +63,7 @@ index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..2a0ada490b15b0c4939dd4304f86e016
+ }
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c9eb69c15cf413bfecd4517be8890de1f3987855..fbee90f10f046f94d44fab9f44de2144651d8180 100644
index a00deb9347b22012b4bd27dfbd85846c49658dcf..8fe0239311748fd234c05dd76832ebb6806f6a2f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -216,9 +216,11 @@ public class PurpurConfig {

2
patches/server/0128-Allow-infinite-and-mending-enchantments-together.patch
View File

@@ -17,7 +17,7 @@ index 408cfa460920f74e0394ab27101ecb12cceb9c43..3d4e34f7070a48c436284ba7744a94ae
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index fbee90f10f046f94d44fab9f44de2144651d8180..cf09d235d68e738042f9e8d1ff44a0e19cac310d 100644
index 8fe0239311748fd234c05dd76832ebb6806f6a2f..847e8363c9d5083ea4b015456abfe3bb2552e257 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -194,6 +194,16 @@ public class PurpurConfig {

2
patches/server/0131-Add-tablist-suffix-option-for-afk.patch
View File

@@ -22,7 +22,7 @@ index a1abdd06478da22bd9c7ea4555afb36efde826c7..e98b5a1caf14f8480d1dd558e7dbe15f
((WorldServer) world).everyoneSleeping();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index cf09d235d68e738042f9e8d1ff44a0e19cac310d..71de8604bf1a977a42c8e13975293163f3c909be 100644
index 847e8363c9d5083ea4b015456abfe3bb2552e257..208e192980faff20767a9bddcb458e301755310d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -133,12 +133,14 @@ public class PurpurConfig {

2
patches/server/0143-Add-demo-command.patch
View File

@@ -30,7 +30,7 @@ index 08cbc787e2bf6587878bdeffa7248e5d23cdcf98..57d39ed441ec7be933f4fce48225f527
public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7);
public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 71de8604bf1a977a42c8e13975293163f3c909be..d3def33b8b166f4e7b50c957b1c02f2a97cf94c2 100644
index 208e192980faff20767a9bddcb458e301755310d..4709fe0db33d64406c3c52991626a377f0a8cf93 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -134,6 +134,7 @@ public class PurpurConfig {

2
patches/server/0148-Config-migration-disable-saving-projectiles-to-disk-.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk ->
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d3def33b8b166f4e7b50c957b1c02f2a97cf94c2..b4eccbfe17ff8dc95f861d4e627fcac9646a7690 100644
index 4709fe0db33d64406c3c52991626a377f0a8cf93..0c1f22249061f600fce2d4d627f0683f461977ba 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@

2
patches/server/0152-EMC-Configurable-disable-give-dropping.patch
View File

@@ -20,7 +20,7 @@ index 1d22c45af884a917e77e02c272fcbae74794200c..7bf90f27fdc48440ef229cca0e100d2c
itemstack.setCount(1);
entityitem = entityplayer.drop(itemstack, false);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b4eccbfe17ff8dc95f861d4e627fcac9646a7690..c7ceb4f1add767c2f534f0b8a228f8408d88e28c 100644
index 0c1f22249061f600fce2d4d627f0683f461977ba..4ea4abc4f03123fa4be7e19b777d4afa0d2002ae 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -188,6 +188,11 @@ public class PurpurConfig {

2
patches/server/0153-Config-migration-climbing-should-not-bypass-cramming.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c7ceb4f1add767c2f534f0b8a228f8408d88e28c..7e0078e9c989fa0abf0eafc822eb3b81e9388c07 100644
index 4ea4abc4f03123fa4be7e19b777d4afa0d2002ae..dbda80c9a57dc7a1882a00020b407dd69a187649 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -142,6 +142,17 @@ public class PurpurConfig {