Skip to content

Commit aa5e794

Browse files
move max-growth-age to global config
1 parent 88f90be commit aa5e794

69 files changed

Lines changed: 428 additions & 428 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

patches/server/0004-Purpur-config-files.patch

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ index dd0143f319d4adef8834c513af34b1cce7a94a84..40f6d9845d2405c6e54c5213618e1b21
6464
if (this.source.acceptsSuccess() && !this.silent) {
6565
this.source.sendSystemMessage(message);
6666
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
67-
index 7c09182f465b66979e1981222d20fa4f574680d5..629024e5c3f480bd50ae2df9dadb72f06a62c3bf 100644
67+
index 01928849f9dd42a3ea8826b56d419e8c09450f47..a18abdcbc51f3b6fda96a4f6dd8674521338f37f 100644
6868
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
6969
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
7070
@@ -223,6 +223,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -84,7 +84,7 @@ index 7c09182f465b66979e1981222d20fa4f574680d5..629024e5c3f480bd50ae2df9dadb72f0
8484
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
8585
// Paper end
8686
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
87-
index 29a2ba6b84c01280f8c7f32e6a78e3dd6c53cb07..544f7ff70486c31e9caddf574265a42c07af3166 100644
87+
index 35d6a8fe168caa5b68b471bd78cc95b99758d1b0..0c397d4c1efc7a812ecc02119b9740cbac303a04 100644
8888
--- a/src/main/java/net/minecraft/world/level/Level.java
8989
+++ b/src/main/java/net/minecraft/world/level/Level.java
9090
@@ -174,6 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -105,7 +105,7 @@ index 29a2ba6b84c01280f8c7f32e6a78e3dd6c53cb07..544f7ff70486c31e9caddf574265a42c
105105
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
106106

107107
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
108-
index f9b2b6f8bededc5d87fcaac59ff14bac7d76073b..27b423da045bbe840b81ccca1729eba047e24d3d 100644
108+
index 8fc70e7f75786ad10a97676a04bc0bc91f9526fe..37af56b657fa2d7e17c02f230b66a514b21cf344 100644
109109
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
110110
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
111111
@@ -966,6 +966,7 @@ public final class CraftServer implements Server {
@@ -172,10 +172,10 @@ index f30621be24c6c3a4f173436fce1ad1c13507c84f..e859f1078a42de196a69818a34a8b2c2
172172
.withRequiredArg()
173173
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
174174
new file mode 100644
175-
index 0000000000000000000000000000000000000000..6dbb2e10ed244845fe9f857b237589900ea3cf40
175+
index 0000000000000000000000000000000000000000..5907e78bb059bca4a63ea8043d0be730412d9c13
176176
--- /dev/null
177177
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
178-
@@ -0,0 +1,170 @@
178+
@@ -0,0 +1,173 @@
179179
+package org.purpurmc.purpur;
180180
+
181181
+import co.aikar.timings.TimingsManager;
@@ -193,6 +193,7 @@ index 0000000000000000000000000000000000000000..6dbb2e10ed244845fe9f857b23758990
193193
+import net.minecraft.world.food.FoodProperties;
194194
+import net.minecraft.world.food.Foods;
195195
+import net.minecraft.world.item.enchantment.Enchantment;
196+
+import net.minecraft.world.level.block.Blocks;
196197
+import org.bukkit.Bukkit;
197198
+import org.bukkit.command.Command;
198199
+import org.bukkit.configuration.ConfigurationSection;
@@ -254,6 +255,8 @@ index 0000000000000000000000000000000000000000..6dbb2e10ed244845fe9f857b23758990
254255
+ set("config-version", 30);
255256
+
256257
+ readConfig(PurpurConfig.class, null);
258+
+
259+
+ Blocks.rebuildCache();
257260
+ }
258261
+
259262
+ protected static void log(String s) {

patches/server/0008-Ridables.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5222,10 +5222,10 @@ index 03d389f3458cd77166a0319fa38c7207e8714e6f..cc0f6a51e10c77928fccf372a45a56aa
52225222
event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
52235223
}
52245224
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
5225-
index 6dbb2e10ed244845fe9f857b237589900ea3cf40..5aee512c0a5a0b5f5fac4214f682b398a1e85862 100644
5225+
index 5907e78bb059bca4a63ea8043d0be730412d9c13..b5d8d9475e563a77c9a7923fc4e780e0fe980347 100644
52265226
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
52275227
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
5228-
@@ -167,4 +167,9 @@ public class PurpurConfig {
5228+
@@ -170,4 +170,9 @@ public class PurpurConfig {
52295229
}
52305230
return builder.build();
52315231
}

patches/server/0010-Barrels-and-enderchests-6-rows.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows
55

66

77
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
8-
index 263e61b655d0ec58b63da859df46f0962de45ec7..0c05466b1265a22009781d469f8d324e3d42e0d3 100644
8+
index 16154d89a1c67ebc9dc6ecaeb214799e75d16b6f..2da8186b5f34b5cce97512f50323bee091d380ab 100644
99
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
1010
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
1111
@@ -1199,6 +1199,27 @@ public abstract class PlayerList {
@@ -236,10 +236,10 @@ index 30ac442049088200e9ab77a561c59cbc58aaa28f..fb3c3c32b89e6a99b50bd04163d29892
236236
}
237237

238238
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
239-
index 5aee512c0a5a0b5f5fac4214f682b398a1e85862..8a7144a65594236a1ec7187348285174594d7a97 100644
239+
index b5d8d9475e563a77c9a7923fc4e780e0fe980347..492fb7fc8452bb214566e1ca1ebfd0f3ee5fde9e 100644
240240
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
241241
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
242-
@@ -172,4 +172,39 @@ public class PurpurConfig {
242+
@@ -175,4 +175,39 @@ public class PurpurConfig {
243243
private static void messages() {
244244
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
245245
}

patches/server/0012-AFK-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ index ea2c76116d8328d2ba6e5e7cc2ed1464f43a8c82..c272fc856113ca2399832b4af7f1e94a
255255
// Purpur end
256256
}
257257
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
258-
index 8a7144a65594236a1ec7187348285174594d7a97..cf7925c5631815a53926543b79179c58e923402e 100644
258+
index 492fb7fc8452bb214566e1ca1ebfd0f3ee5fde9e..88b76a75623d306da3bb3d935e7598a94d882181 100644
259259
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
260260
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
261-
@@ -169,8 +169,16 @@ public class PurpurConfig {
261+
@@ -172,8 +172,16 @@ public class PurpurConfig {
262262
}
263263

264264
public static String cannotRideMob = "<red>You cannot mount that mob";

patches/server/0014-Configurable-server-mod-name.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ index 7f0551e70c545f8e77d18b11e836233faeba9161..ffa6466c21ddc6a312a0a3aa400717a4
1818

1919
public SystemReport fillSystemReport(SystemReport details) {
2020
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
21-
index cf7925c5631815a53926543b79179c58e923402e..290c1ac6e1e7bd485a6c63492d4f72b55af7b46b 100644
21+
index 88b76a75623d306da3bb3d935e7598a94d882181..fae76fe21abd4aa5911d9c2d6248c189104d3063 100644
2222
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
2323
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
24-
@@ -181,6 +181,11 @@ public class PurpurConfig {
24+
@@ -184,6 +184,11 @@ public class PurpurConfig {
2525
afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
2626
}
2727

patches/server/0016-Lagging-threshold.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ index e25f6e051880327873ffbfbc81aaef924ac27b5b..e90a16c47de51752b7afb6cc7c320779
4040
// Purpur end
4141
}
4242
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
43-
index 290c1ac6e1e7bd485a6c63492d4f72b55af7b46b..c8e4ab0302c2cc4bac858169d68adc48c2047026 100644
43+
index fae76fe21abd4aa5911d9c2d6248c189104d3063..bbe9d16183bba54d6b2869ab23a9683497d15b8a 100644
4444
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
4545
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
46-
@@ -186,6 +186,11 @@ public class PurpurConfig {
46+
@@ -189,6 +189,11 @@ public class PurpurConfig {
4747
serverModName = getString("settings.server-mod-name", serverModName);
4848
}
4949

patches/server/0022-Alternative-Keepalive-Handling.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ index 3a2b67b459692a30feaec8362e44be5560741b55..c32ae28c75aaeb29a764f7791b47cb5f
5656
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
5757
int i = (int) (Util.getMillis() - this.keepAliveTime);
5858
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
59-
index c8e4ab0302c2cc4bac858169d68adc48c2047026..20b86de8b204df1636b76073c434f5e436f77379 100644
59+
index bbe9d16183bba54d6b2869ab23a9683497d15b8a..7f0cc9d6187babc7a1cb78557208cebf373ee75c 100644
6060
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
6161
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
62-
@@ -191,6 +191,11 @@ public class PurpurConfig {
62+
@@ -194,6 +194,11 @@ public class PurpurConfig {
6363
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
6464
}
6565

patches/server/0026-Logger-settings-suppressing-pointless-logs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ index b2a15c986c7500a0ce227a54cb61ec3f5378f6f3..14600a7bc01bf61e8ffb736816d23df6
5353
if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
5454
new Exception().printStackTrace();
5555
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
56-
index 20b86de8b204df1636b76073c434f5e436f77379..918eee23167fb9b39bd19ba1a6d8776f83d56ea2 100644
56+
index 7f0cc9d6187babc7a1cb78557208cebf373ee75c..8e620bd5a3984a3cc3751a7bd1bc06b67fbda0f2 100644
5757
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
5858
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
59-
@@ -230,4 +230,15 @@ public class PurpurConfig {
59+
@@ -233,4 +233,15 @@ public class PurpurConfig {
6060
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
6161
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
6262
}

patches/server/0052-Configurable-TPS-Catchup.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ index c1719af753e4efa8fcbd49a801ee86b307d27779..963a1998f808061c7e7fcd0d15725e38
2424
this.profiler.pop();
2525
this.endMetricsRecordingTick();
2626
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
27-
index 918eee23167fb9b39bd19ba1a6d8776f83d56ea2..75570f6de691fb5dc95dd31d2255f3913a7100dd 100644
27+
index 8e620bd5a3984a3cc3751a7bd1bc06b67fbda0f2..520e266a1aea7240a0e56a1350f23ec28622d11c 100644
2828
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
2929
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
30-
@@ -241,4 +241,9 @@ public class PurpurConfig {
30+
@@ -244,4 +244,9 @@ public class PurpurConfig {
3131
loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
3232
loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
3333
}

patches/server/0068-Add-ping-command.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ping command
55

66

77
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
8-
index 18edc532315301abe2e0920da496aafd68627fe8..9ea2306939cb772f320469d2fdbef1b9eb170eee 100644
8+
index 98664c95331cee4139711c402dfaf406ee672c22..be38b98894cc24c9af55ba470dc8a03a24737782 100644
99
--- a/src/main/java/net/minecraft/commands/Commands.java
1010
+++ b/src/main/java/net/minecraft/commands/Commands.java
1111
@@ -207,6 +207,7 @@ public class Commands {
@@ -17,10 +17,10 @@ index 18edc532315301abe2e0920da496aafd68627fe8..9ea2306939cb772f320469d2fdbef1b9
1717

1818
if (environment.includeIntegrated) {
1919
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
20-
index 75570f6de691fb5dc95dd31d2255f3913a7100dd..c9d303aeb32fe79bf84919a46981aaaa6eb77147 100644
20+
index 520e266a1aea7240a0e56a1350f23ec28622d11c..497e7ab73dffbc62e90249d0b7d44ea9b6d7e2d6 100644
2121
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
2222
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
23-
@@ -173,12 +173,14 @@ public class PurpurConfig {
23+
@@ -176,12 +176,14 @@ public class PurpurConfig {
2424
public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
2525
public static String afkTabListPrefix = "[AFK] ";
2626
public static String afkTabListSuffix = "";

0 commit comments

Comments
 (0)