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

move max-growth-age to global config

Browse Source
This commit is contained in:
BillyGalbreath
2022-09-28 17:52:06 -05:00
parent 88f90be370
commit aa5e794e87
69 changed files with 428 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0140-Dont-run-with-scissors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a761a005001fede9e3db415753a4ead59d7dd6f8..0010a80db783d1b33af7751d0c2d85a97df85add 100644
index 786030fd80a1a8de3e6bb89c444bc49895bcd7e3..9e08659c31269ff1d1cd44e98bbb773cf469d6f7 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1696,6 +1696,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -70,10 +70,10 @@ index cc0f6a51e10c77928fccf372a45a56aa6f2b298a..f4ca0a9481533befc78cb18c1f981082
if (cause != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 27794670b54f1a96e4e82ed23ab0769a0506b52a..c2bfd97e11e887d7a112ba024be6048ac3d46bee 100644
index cbe4d2d692edf29f9f6587871058fc1b3c53a731..bbc5d5af660b2aba16b02a9f8b33c8776f12ddba 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -177,6 +177,7 @@ public class PurpurConfig {
@@ -180,6 +180,7 @@ public class PurpurConfig {
public static String demoCommandOutput = "<green>%s has been shown the demo screen";
public static String pingCommandOutput = "<green>%s's ping is %sms";
public static String tpsbarCommandOutput = "<green>Tpsbar toggled <onoff> for <target>";
@@ -81,7 +81,7 @@ index 27794670b54f1a96e4e82ed23ab0769a0506b52a..c2bfd97e11e887d7a112ba024be6048a
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
@@ -187,6 +188,12 @@ public class PurpurConfig {
@@ -190,6 +191,12 @@ public class PurpurConfig {
demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput);
pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput);
tpsbarCommandOutput = getString("settings.messages.tpsbar-command-output", tpsbarCommandOutput);
@@ -95,7 +95,7 @@ index 27794670b54f1a96e4e82ed23ab0769a0506b52a..c2bfd97e11e887d7a112ba024be6048a
public static String serverModName = "Purpur";
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 3624304329d0a6728c0e4981bd9dcfb350edaab5..2e15e592bbc13f4aca99745dd068b12d5f8a253c 100644
index 41a4abb7c676285435f9a744ae3f50b9c80c8cbd..46fbf50268f8531c11efccba0f971b19bdfd4a0e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -199,6 +199,8 @@ public class PurpurWorldConfig {