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

fix timings url migration

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-15 18:14:22 -05:00
parent 4f95f1de85
commit 809e0f6fee
26 changed files with 70 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0008-Timings-stuff.patch
View File

@@ -62,25 +62,3 @@ index cd918cec00d8202252af0d20b1a8891371c538e3..6c1b67fbd4524aac075e93ed454f7139
if (!TimingsManager.url.endsWith("/")) {
TimingsManager.url += "/";
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 5350ffab8477a2da4891132cf8b7a65cf776574b..c19f962794a1fed3292dc7ed90e11829c3b37a6c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -161,4 +161,17 @@ public class PurpurConfig {
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
}
+
+ private static void timingsSettings() {
+ if (version < 18) {
+ String oldVal = getString("settings.timings.url", "https://timings.pl3x.net");
+ com.destroystokyo.paper.PaperConfig.config.set("timings.url", oldVal);
+ TimingsManager.url = getString("timings.url", oldVal);
+ if (!TimingsManager.url.endsWith("/")) {
+ TimingsManager.url += "/";
+ }
+ set("settings.timings.url", null);
+ }
+ if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
+ }
}

8
patches/server/0009-Barrels-and-enderchests-6-rows.patch
View File

@@ -208,12 +208,12 @@ index 396a4ae3d5a829eda78ef98561333aea300aa722..91478d614a56d1ac371187515d4c92b2
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index dac7a163df51604c522614c28a2d4d2c6ecd0eba..c961e81a0e8bc7360f8ef7235c576e6629b67b49 100644
index 5350ffab8477a2da4891132cf8b7a65cf776574b..b404fcddc67b7593201f1679587d0ac4c4bfd51c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -174,4 +174,39 @@ public class PurpurConfig {
}
if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
@@ -161,4 +161,39 @@ public class PurpurConfig {
private static void messages() {
cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
}
+
+ public static int barrelRows = 3;

4
patches/server/0011-AFK-API.patch
View File

@@ -255,7 +255,7 @@ index f32a4aaa0f027b71043109c78c8a5e18e0397350..db49d331e76a0c86515cb06caba8d6e1
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index a596ac346cfbfcb428e995a97d55b74ae8caf87b..0a6de8a3761c3c16b4ff1fb35db5d20a978d8017 100644
index b404fcddc67b7593201f1679587d0ac4c4bfd51c..25f31ce77337079ebc2074f1ae2990ccaac03860 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -158,8 +158,16 @@ public class PurpurConfig {
@@ -274,7 +274,7 @@ index a596ac346cfbfcb428e995a97d55b74ae8caf87b..0a6de8a3761c3c16b4ff1fb35db5d20a
+ afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix);
}
private static void timingsSettings() {
public static int barrelRows = 3;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index c250faf84817f67dea7f088fa2530be82fcf7688..3fdd013d88e1c4ef62b277ed71a3531e2db8253f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

8
patches/server/0013-Configurable-server-mod-name.patch
View File

@@ -18,7 +18,7 @@ index 973ea150c2f8ac136736b4ae9f505491e2fc80c2..1cb6c989a0b21df7dff72062550daa09
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index fde15dee7633bad9582fe5d26eee0badf17477cd..c428c332cbb9f632b36bc4b6bf7d0767a16e350a 100644
index 25f31ce77337079ebc2074f1ae2990ccaac03860..1037f51ab043a8808220765805d58800dff01096 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -170,6 +170,11 @@ public class PurpurConfig {
@@ -30,6 +30,6 @@ index fde15dee7633bad9582fe5d26eee0badf17477cd..c428c332cbb9f632b36bc4b6bf7d0767
+ serverModName = getString("settings.server-mod-name", serverModName);
+ }
+
private static void timingsSettings() {
if (version < 18) {
String oldVal = getString("settings.timings.url", "https://timings.pl3x.net");
public static int barrelRows = 3;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;

6
patches/server/0015-Lagging-threshold.patch
View File

@@ -40,11 +40,11 @@ index da5651f61be49bcceb9b912f155b24c511a9a5ca..cc0e2adaa6f857ad646b1a853faf7a97
// Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 35797b7ed354c08066ecff563bba2c38265421bb..21e072e105a824e97fa713c72dd0b7bca1229870 100644
index 1037f51ab043a8808220765805d58800dff01096..71ff4ddc1cad11e9b25c2889c8385242a8bdc113 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -188,6 +188,11 @@ public class PurpurConfig {
if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip");
@@ -175,6 +175,11 @@ public class PurpurConfig {
serverModName = getString("settings.server-mod-name", serverModName);
}
+ public static double laggingThreshold = 19.0D;

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

@@ -56,10 +56,10 @@ index 072a34d8f8a075f22c14634acd0dd50ec57b773c..c2e849f37c03839631f621065bf52b4c
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
int i = (int) (Util.getMillis() - this.keepAliveTime);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 21e072e105a824e97fa713c72dd0b7bca1229870..4baed73f3e5ce88bc3993b2edc7c6bbf572ee448 100644
index 71ff4ddc1cad11e9b25c2889c8385242a8bdc113..f230912cea515c0c671b24e12df5cf0c454b18f0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -193,6 +193,11 @@ public class PurpurConfig {
@@ -180,6 +180,11 @@ public class PurpurConfig {
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
}

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

@@ -41,10 +41,10 @@ index b2a15c986c7500a0ce227a54cb61ec3f5378f6f3..14600a7bc01bf61e8ffb736816d23df6
if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
new Exception().printStackTrace();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index c8e5db9086c618b97e1712777dcbb7f2e798ca2d..cb3772bf3ccf33b1111aac18d82194f04a767dfd 100644
index f230912cea515c0c671b24e12df5cf0c454b18f0..f11d1486f2e3f2ba359aabbf189a71ae42eeb0f8 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -232,4 +232,13 @@ public class PurpurConfig {
@@ -219,4 +219,13 @@ public class PurpurConfig {
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

4
patches/server/0052-Configurable-TPS-Catchup.patch
View File

@@ -24,10 +24,10 @@ index 4d89c9de4b4aae4452750fb941a2e610b8834039..55067e47a9907f038bf77f5dda2f3957
this.profiler.pop();
this.endMetricsRecordingTick();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index cb3772bf3ccf33b1111aac18d82194f04a767dfd..a4c61fe79d3d94d8659c9861a7788d962f743bb2 100644
index f11d1486f2e3f2ba359aabbf189a71ae42eeb0f8..20d56b2e85a4b03fb13848d4eff1c84a6711b821 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -241,4 +241,9 @@ public class PurpurConfig {
@@ -228,4 +228,9 @@ public class PurpurConfig {
loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
}

6
patches/server/0077-Add-allow-water-in-end-world-option.patch
View File

@@ -27,7 +27,7 @@ index b5a5c56fbb66c17dd2e2d1f4d69d2b1826cd4951..9805132a1b11d62c3491c178fbed8b6a
return true;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 729d11569e59e78a0fda67697fe9e27adefff730..244f7dd3f2cdb70a471b2a547aa407ac0f258ef9 100644
index 03a4c5fa746033825c26a031fbf79f721be6fa84..70d87c16734a5e1ac14cc494f95554137ba9f06e 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1496,4 +1496,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -68,10 +68,10 @@ index 2676cddca511ea775766cec0001269407599df6e..1dacd2e3a9340420c9b4443cc2f8a3c6
} else {
world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index facf2b59f7f9a81b34ed736aca2e7494ef37a47a..c2da5339ef01410d218bf48c919700939910d5d0 100644
index e95b4a1f07facda1daf1e83560e98e649a1b79ec..ef94029ca1c695291562325de4ce77ab4647164d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -239,6 +239,11 @@ public class PurpurConfig {
@@ -226,6 +226,11 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

4
patches/server/0087-Add-option-to-disable-certain-block-updates.patch
View File

@@ -125,10 +125,10 @@ index 16e11e31077f160198e0b04abdfeabb97ed20c6f..7dd423f6b92b7f27dd43e5ef3f4029a1
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 4a685f527331df28dcd91586140916e3a1df6716..d4497231fa4a4ca104e78bade9c75c49f0d06ee7 100644
index ef94029ca1c695291562325de4ce77ab4647164d..90deba209710608839276cce46ffe8e6674ec4fd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -244,6 +244,15 @@ public class PurpurConfig {
@@ -231,6 +231,15 @@ public class PurpurConfig {
allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
}

6
patches/server/0091-Short-enderman-height.patch
View File

@@ -19,7 +19,7 @@ index 4236c9dfa0be6fa8ad2f3e32d7f65f1b722c4e60..7307b3208f1b4ffe31fc4e6f73ac7264
private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
return (EntityType) Registry.register(Registry.ENTITY_TYPE, id, (EntityType<T>) type.build(id)); // CraftBukkit - decompile error
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index cff1fc69f75c923ecb162b22dc0ec5bb5c2fbfe0..37e71377ead8d3fd98ff6f6d643d31042944b43f 100644
index 2e831d7901747d7957becddc2daf453c4f30bdcc..c72d5151d4d8eb784550022321578ca820c84948 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -399,6 +399,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -31,10 +31,10 @@ index cff1fc69f75c923ecb162b22dc0ec5bb5c2fbfe0..37e71377ead8d3fd98ff6f6d643d3104
Entity entity = source.getDirectEntity();
boolean flag;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 4f8a4b053a996589bf6c9f9107da3cabc8c791da..f600030f2225abc6e21a0e8a33300c27863112d1 100644
index 90deba209710608839276cce46ffe8e6674ec4fd..2b980cde739495c1ba80cf4a34f38072f25b0507 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -239,6 +239,12 @@ public class PurpurConfig {
@@ -226,6 +226,12 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

6
patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -18,10 +18,10 @@ index 5d76674d5e181f012c0686e9915556bc93087706..3f3a8b577f707ad0a80d27fca2d61b09
private final LevelAccessor level;
private final Direction.Axis axis;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index f600030f2225abc6e21a0e8a33300c27863112d1..908137ec6461f1ae11ad49e9d8a4ca2fe584e0ce 100644
index 2b980cde739495c1ba80cf4a34f38072f25b0507..f0051835d259ecfd0300653645c3942749a31937 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -207,6 +207,7 @@ public class PurpurConfig {
@@ -194,6 +194,7 @@ public class PurpurConfig {
public static int barrelRows = 3;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
@@ -29,7 +29,7 @@ index f600030f2225abc6e21a0e8a33300c27863112d1..908137ec6461f1ae11ad49e9d8a4ca2f
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -237,6 +238,7 @@ public class PurpurConfig {
@@ -224,6 +225,7 @@ public class PurpurConfig {
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);

4
patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch
View File

@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..5cebd7c16b82eea9dbf39c51c671bacb
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 908137ec6461f1ae11ad49e9d8a4ca2fe584e0ce..8ec92ddf6373638ec2af2b8361e97ecb8b56993a 100644
index f0051835d259ecfd0300653645c3942749a31937..e31f6b2dd2ed37070d6a4dde3671e70195384244 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -241,6 +241,16 @@ public class PurpurConfig {
@@ -228,6 +228,16 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
}

4
patches/server/0119-EMC-Configurable-disable-give-dropping.patch
View File

@@ -20,10 +20,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..fcd65feb5182b806b9aa8ecdcf11b386
itemStack.setCount(1);
ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 14812231bfa1a48e622de8281e55661b857c56c7..e654f940f0c6cf6b6bc0cbcfd8d440df5375a8de 100644
index e31f6b2dd2ed37070d6a4dde3671e70195384244..5d85d7d732728e53f75892caadf58086a9763956 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -204,6 +204,11 @@ public class PurpurConfig {
@@ -191,6 +191,11 @@ public class PurpurConfig {
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
}

6
patches/server/0127-Implement-TPSBar.patch
View File

@@ -42,7 +42,7 @@ index 8bf98d8f8e9f0baaf203a9e8d18683236856eab7..455776981274e64724376a3182b60784
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index bb392c810776264b08db6588ed9253a5aadef021..ea852a092231a9fd0a9bfc4dc1e31c859db17ade 100644
index dfe547b7a2caa2ecfdddef9b9a49be40d26c5da8..951e45f7b17f6f903c99634177395464a1889c0f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -256,6 +256,7 @@ public class ServerPlayer extends Player {
@@ -105,10 +105,10 @@ index 5c11e91e1eebb0e24aaca9af323a9d5ecdc0a411..63e8397d6eff95ed81ab5d7cdb69495e
entityplayer.awardStat(Stats.LEAVE_GAME);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index e654f940f0c6cf6b6bc0cbcfd8d440df5375a8de..600b9e9bc6a9c92920c8ec28764e64dfc1fd6e3f 100644
index 5d85d7d732728e53f75892caadf58086a9763956..574f01f5b31c5d8110e2e8a80ef61f4b794e3d21 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -209,6 +209,29 @@ public class PurpurConfig {
@@ -196,6 +196,29 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}

6
patches/server/0157-Allow-infinity-on-crossbows.patch
View File

@@ -77,10 +77,10 @@ index 11c1eb0e0bc326b28dc0cab16f67c413cc52e98c..7073985656ae5b17a7489518747dc858
return null;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 47eb362ba73bb20e738af6dea60e86ffe5492315..5cd63b9db24729d96434dc43c8f5e0ba3ac60865 100644
index 05a7c307da51d31f822730b03c83db9873296e25..7687431598b8f40659d0f8add1f3c0709430cb2c 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -272,6 +272,7 @@ public class PurpurConfig {
@@ -259,6 +259,7 @@ public class PurpurConfig {
}
public static boolean allowInfinityMending = false;
@@ -88,7 +88,7 @@ index 47eb362ba73bb20e738af6dea60e86ffe5492315..5cd63b9db24729d96434dc43c8f5e0ba
private static void enchantmentSettings() {
if (version < 5) {
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
@@ -279,6 +280,7 @@ public class PurpurConfig {
@@ -266,6 +267,7 @@ public class PurpurConfig {
set("settings.enchantment.allow-infinite-and-mending-together", null);
}
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);

6
patches/server/0163-Config-to-allow-for-unsafe-enchants.patch
View File

@@ -75,10 +75,10 @@ index 31ac7e1e5cc37cd9abf0ffd0bab1402f51bffed9..fd8d102ac8e84c4bfe6f4431bd1088b8
this.getOrCreateTag().put(key, element);
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 5cd63b9db24729d96434dc43c8f5e0ba3ac60865..057ebea07a435fa7e2ed9ec3ca107cde4398a3ee 100644
index 7687431598b8f40659d0f8add1f3c0709430cb2c..40f73fc7789d3baaa5d7ee4cef3677228d1fece7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -273,6 +273,7 @@ public class PurpurConfig {
@@ -260,6 +260,7 @@ public class PurpurConfig {
public static boolean allowInfinityMending = false;
public static boolean allowCrossbowInfinity = false;
@@ -86,7 +86,7 @@ index 5cd63b9db24729d96434dc43c8f5e0ba3ac60865..057ebea07a435fa7e2ed9ec3ca107cde
private static void enchantmentSettings() {
if (version < 5) {
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
@@ -281,6 +282,7 @@ public class PurpurConfig {
@@ -268,6 +269,7 @@ public class PurpurConfig {
}
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);

8
patches/server/0168-Config-to-change-max-number-of-bees.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to change max number of bees
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
index 9fcd835d219aafbe113ebb1b796052e07bf2b046..2f8e6fb9f811fcfa6b6ed4dd15fcb38f061c8491 100644
index 5c784e1155c16dbbe1b75bb5bcb3d73793d146a3..e5a397ec31cbd3ae85f3c37519811f5869cddc5a 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
@@ -43,7 +43,7 @@ public class BeehiveBlockEntity extends BlockEntity {
@@ -18,10 +18,10 @@ index 9fcd835d219aafbe113ebb1b796052e07bf2b046..2f8e6fb9f811fcfa6b6ed4dd15fcb38f
public BeehiveBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.BEEHIVE, pos, state);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 057ebea07a435fa7e2ed9ec3ca107cde4398a3ee..2c3cdaa093f28954620f17ee92b4fdc0e4508d51 100644
index 40f73fc7789d3baaa5d7ee4cef3677228d1fece7..7c066e88919468219878615deae233e4ca977d54 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -238,6 +238,7 @@ public class PurpurConfig {
@@ -225,6 +225,7 @@ public class PurpurConfig {
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
@@ -29,7 +29,7 @@ index 057ebea07a435fa7e2ed9ec3ca107cde4398a3ee..2c3cdaa093f28954620f17ee92b4fdc0
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -269,6 +270,7 @@ public class PurpurConfig {
@@ -256,6 +257,7 @@ public class PurpurConfig {
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);

6
patches/server/0171-Gamemode-extra-permissions.patch
View File

@@ -75,10 +75,10 @@ index 6cc517b394bafefce50d877761e5b2eee8e14c78..46ca899a7abddea108f6ff1b4ca14ca5
DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "toggledownfall", "Allows the user to toggle rain on/off for a given world", PermissionDefault.OP, commands);
DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "defaultgamemode", "Allows the user to change the default gamemode of the server", PermissionDefault.OP, commands);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 2c3cdaa093f28954620f17ee92b4fdc0e4508d51..39840a49c3900e227f1410db07abdc98051a7269 100644
index 7c066e88919468219878615deae233e4ca977d54..68f1ea235152b6a9e3bc09ae827a6ceb6fb108cd 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -221,6 +221,7 @@ public class PurpurConfig {
@@ -208,6 +208,7 @@ public class PurpurConfig {
public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
public static int commandTPSBarTickInterval = 20;
@@ -86,7 +86,7 @@ index 2c3cdaa093f28954620f17ee92b4fdc0e4508d51..39840a49c3900e227f1410db07abdc98
private static void commandSettings() {
commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
@@ -232,6 +233,7 @@ public class PurpurConfig {
@@ -219,6 +220,7 @@ public class PurpurConfig {
commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);

6
patches/server/0177-Hide-hidden-players-from-entity-selector.patch
View File

@@ -59,10 +59,10 @@ index 35cc3bba20afd4a47160cc674415ba6a3a0ec0ec..2cba35dcc479ed9ad3e698aa2e02b4aa
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 96804df7f7e095d0ea0b9d01d8752fa293023ca3..47a731efd6f28096439089d69a3502193ba3f000 100644
index 077c2293a0982231904a32c55a789f6d3bc3b0f4..111efe9539cb8e70cb2302aa1c4045871509c324 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -234,6 +234,7 @@ public class PurpurConfig {
@@ -221,6 +221,7 @@ public class PurpurConfig {
public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
public static int commandTPSBarTickInterval = 20;
public static boolean commandGamemodeRequiresPermission = false;
@@ -70,7 +70,7 @@ index 96804df7f7e095d0ea0b9d01d8752fa293023ca3..47a731efd6f28096439089d69a350219
private static void commandSettings() {
commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
@@ -246,6 +247,7 @@ public class PurpurConfig {
@@ -233,6 +234,7 @@ public class PurpurConfig {
commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);

6
patches/server/0185-Make-anvil-cumulative-cost-configurable.patch
View File

@@ -18,10 +18,10 @@ index 3f786be9c9efc069a3a1bc457f02421310941800..669093b7f531b4ff9d8348d0a08c8690
public void setItemName(String newItemName) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 552e3cbd352302fb0dbc4c2b80df465c13012b84..8321e23dd4f8b553f085bbb9aec0dd17421a2c95 100644
index a1a6f7ae168c3cd4cdc0a002c74c803024e41190..e978758dd04868217d1c136ff7dad8c48b97298b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -257,6 +257,7 @@ public class PurpurConfig {
@@ -244,6 +244,7 @@ public class PurpurConfig {
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
@@ -29,7 +29,7 @@ index 552e3cbd352302fb0dbc4c2b80df465c13012b84..8321e23dd4f8b553f085bbb9aec0dd17
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -289,6 +290,7 @@ public class PurpurConfig {
@@ -276,6 +277,7 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);

6
patches/server/0194-Make-lightning-rod-range-configurable.patch
View File

@@ -18,10 +18,10 @@ index 95a2455f53d2615bdc0e7eb8b5366f9a3e369cf5..2eba2af9bb3fb0aaa9b2f5af6ae5fd20
return optional.map((blockposition1) -> {
return blockposition1.above(1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 8321e23dd4f8b553f085bbb9aec0dd17421a2c95..9428d187532a4f3413f76bc9ab2b34be0f946c95 100644
index e978758dd04868217d1c136ff7dad8c48b97298b..6be7293e6e368b2b05502b3e086cceb113a3cad4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -258,6 +258,7 @@ public class PurpurConfig {
@@ -245,6 +245,7 @@ public class PurpurConfig {
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
public static boolean anvilCumulativeCost = true;
@@ -29,7 +29,7 @@ index 8321e23dd4f8b553f085bbb9aec0dd17421a2c95..9428d187532a4f3413f76bc9ab2b34be
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -291,6 +292,7 @@ public class PurpurConfig {
@@ -278,6 +279,7 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);

6
patches/server/0204-Add-uptime-command.patch
View File

@@ -29,7 +29,7 @@ index e759c7f4686a88fdfd15d9ecd6b891f60b026468..3d45aa3cf8e25790dba332105c397dce
public int autosavePeriod;
public Commands vanillaCommandDispatcher;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 9428d187532a4f3413f76bc9ab2b34be0f946c95..60c6793cf7a684f7c111c05fc453413e1ea3fd2f 100644
index 6be7293e6e368b2b05502b3e086cceb113a3cad4..64a8dad26d17a9f921d4fd57991dab955e08afb5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -166,6 +166,7 @@ public class PurpurConfig {
@@ -48,7 +48,7 @@ index 9428d187532a4f3413f76bc9ab2b34be0f946c95..60c6793cf7a684f7c111c05fc453413e
unverifiedUsername = getString("settings.messages.unverified-username", unverifiedUsername);
}
@@ -237,6 +239,15 @@ public class PurpurConfig {
@@ -224,6 +226,15 @@ public class PurpurConfig {
public static int commandTPSBarTickInterval = 20;
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
@@ -64,7 +64,7 @@ index 9428d187532a4f3413f76bc9ab2b34be0f946c95..60c6793cf7a684f7c111c05fc453413e
private static void commandSettings() {
commandTPSBarTitle = getString("settings.command.tpsbar.title", commandTPSBarTitle);
commandTPSBarProgressOverlay = BossBar.Overlay.valueOf(getString("settings.command.tpsbar.overlay", commandTPSBarProgressOverlay.name()));
@@ -250,6 +261,15 @@ public class PurpurConfig {
@@ -237,6 +248,15 @@ public class PurpurConfig {
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);
commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission);
hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);

6
patches/server/0215-Add-compass-command.patch
View File

@@ -81,10 +81,10 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..49e86b191397b49480684e7d99a515e9
CompoundTag compoundTag = stack.getOrCreateTag();
if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 049bf902e8e77d7eac8dc868593c215bf04838a9..2b90f0aa67e3ed19e29c5ec72cf8947391bffdb7 100644
index e230f65d8599f1d6f8c567227859935a905426f8..a75db67d2ed1d3440903396181b4cd6cf982f15d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -252,6 +252,11 @@ public class PurpurConfig {
@@ -239,6 +239,11 @@ public class PurpurConfig {
public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
public static int commandTPSBarTickInterval = 20;
@@ -96,7 +96,7 @@ index 049bf902e8e77d7eac8dc868593c215bf04838a9..2b90f0aa67e3ed19e29c5ec72cf89473
public static boolean commandGamemodeRequiresPermission = false;
public static boolean hideHiddenPlayersFromEntitySelector = false;
public static String uptimeFormat = "<days><hours><minutes><seconds>";
@@ -274,6 +279,13 @@ public class PurpurConfig {
@@ -261,6 +266,13 @@ public class PurpurConfig {
commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);

6
patches/server/0238-Config-for-Grindstones-ignoring-curses.patch
View File

@@ -36,10 +36,10 @@ index 0bdf874ddb951daf8d469575a44144504472d12d..66d1b438227e004d7ffb6e7c5d0cd3e6
EnchantmentHelper.setEnchantments(map, itemstack1);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 2b90f0aa67e3ed19e29c5ec72cf8947391bffdb7..b651a42f268e0636ccd86a7de9acfeb1cf3810f7 100644
index a75db67d2ed1d3440903396181b4cd6cf982f15d..3b07195c1255bdac9bdc8b1286edb5d5c1eb7cf4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -306,6 +306,7 @@ public class PurpurConfig {
@@ -293,6 +293,7 @@ public class PurpurConfig {
public static int beeInsideBeeHive = 3;
public static boolean anvilCumulativeCost = true;
public static int lightningRodRange = 128;
@@ -47,7 +47,7 @@ index 2b90f0aa67e3ed19e29c5ec72cf8947391bffdb7..b651a42f268e0636ccd86a7de9acfeb1
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -340,6 +341,7 @@ public class PurpurConfig {
@@ -327,6 +328,7 @@ public class PurpurConfig {
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);

4
patches/server/0239-UPnP-Port-Forwarding.patch
View File

@@ -67,10 +67,10 @@ index cd859eec6b0bee44bce83614e55709381baf5e6b..9412a238aa3538bf958cf3b5ce2be5a9
// CraftBukkit start
// this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index b651a42f268e0636ccd86a7de9acfeb1cf3810f7..141a46499eb2cba73a3f71fb50926bc08f37f9f0 100644
index 3b07195c1255bdac9bdc8b1286edb5d5c1eb7cf4..5c9973374991446c39d6a84d745283eac3eb70ab 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -391,4 +391,9 @@ public class PurpurConfig {
@@ -378,4 +378,9 @@ public class PurpurConfig {
private static void tpsCatchup() {
tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
}