diff --git a/patches/server/0002-Fix-pufferfish-issues.patch b/patches/server/0002-Fix-pufferfish-issues.patch index 3e9cb0f32..def3bace7 100644 --- a/patches/server/0002-Fix-pufferfish-issues.patch +++ b/patches/server/0002-Fix-pufferfish-issues.patch @@ -18,10 +18,27 @@ index 96d831791edbe6ae07325008b760f70f75c4d713..83e2c8784eaa77851e9efc6b889d673c } // Pufferfish end diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index f5a43a1e1a78b3eaabbcadc7af09750ee478eeb6..68fec1c808a16ecbf2451daa3bb8f02c1bdfe7c4 100644 +index f5a43a1e1a78b3eaabbcadc7af09750ee478eeb6..3ff4f092a59242a8cb930c084915a774db881652 100644 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -@@ -229,7 +229,7 @@ public class PufferfishConfig { +@@ -25,6 +25,7 @@ public class PufferfishConfig { + + private static final YamlFile config = new YamlFile(); + private static int updates = 0; ++ public static File pufferfishFile; // Purpur - Fix pufferfish issues + + private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) { + ConfigurationSection newSection = new MemoryConfiguration(); +@@ -47,7 +48,7 @@ public class PufferfishConfig { + } + + public static void load() throws IOException { +- File configFile = new File("pufferfish.yml"); ++ File configFile = pufferfishFile; // Purpur - Fix pufferfish issues + + if (configFile.exists()) { + try { +@@ -229,7 +230,7 @@ public class PufferfishConfig { public static int activationDistanceMod; private static void dynamicActivationOfBrains() throws IOException { @@ -30,7 +47,7 @@ index f5a43a1e1a78b3eaabbcadc7af09750ee478eeb6..68fec1c808a16ecbf2451daa3bb8f02c startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12, "This value determines how far away an entity has to be", "from the player to start being effected by DEAR."); -@@ -256,7 +256,7 @@ public class PufferfishConfig { +@@ -256,7 +257,7 @@ public class PufferfishConfig { public static boolean throttleInactiveGoalSelectorTick; private static void inactiveGoalSelectorThrottle() { @@ -72,6 +89,18 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..19d602e4e6fa5abf59559eab4132677b } @Override +diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +index d62f7375394409a278bc565c8263506c598ceeba..8ccf355a2541c8fb725c312c6955bb6cf624ff0f 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -236,6 +236,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark + com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics + com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now ++ gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur - Fix pufferfish issues + gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish + gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish + diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java index 593b343b7cd5a24e34ad19a9e93eb9258f862357..80ff364514d071d1862c4b3aa5d01b9c39062946 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -98,3 +127,21 @@ index 99a95d77f44dddfd7be6c2ebd60e827d9de956b7..00ea1c2037c7c7780764bfcc3e07b655 } // CraftBukkit start +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index 1c2439ffc1e407ff69286817d22f127470ce07ba..d74f885fcdf686359f761aa7356fe03cf293ee59 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -176,6 +176,13 @@ public class Main { + .describedAs("Jar file"); + // Paper end + ++ // Purpur start - Fix pufferfish issues ++ acceptsAll(asList("pufferfish", "pufferfish-settings"), "File for pufferfish settings") ++ .withRequiredArg() ++ .ofType(File.class) ++ .defaultsTo(new File("pufferfish.yml")) ++ .describedAs("Yml file"); ++ // Purpur end - Fix pufferfish issues + // Paper start + acceptsAll(asList("server-name"), "Name of the server") + .withRequiredArg() diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch index 2460013c1..fc11ac23e 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -72,7 +72,7 @@ index 13bd145b1e8006a53c22f5dc0c78f29b540c7663..7b2daf47e411362a462019a1612a99c9 boolean flag1 = this.source.acceptsSuccess() && !this.silent; boolean flag2 = broadcastToOps && this.source.shouldInformAdmins() && !this.silent; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index d62f7375394409a278bc565c8263506c598ceeba..fca644c904fe5f4b2637ed9d3062ae247751b9f1 100644 +index 8ccf355a2541c8fb725c312c6955bb6cf624ff0f..135dd18f143e2cfe21ac35019aee61f6cdc80ef7 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -235,6 +235,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -89,8 +89,8 @@ index d62f7375394409a278bc565c8263506c598ceeba..fca644c904fe5f4b2637ed9d3062ae24 + org.purpurmc.purpur.PurpurConfig.registerCommands(); + // Purpur end - Purpur config files com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now + gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur - Fix pufferfish issues gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish - gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 6470f145e2470574a40ddce6ca5bf924c1bb094c..62d4ccafc005ff00c17db9863db56b9ec77735c7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java @@ -159,13 +159,13 @@ index 97b5d6ba2b19a7c730730c74175a29157aed1840..cc2f23613644126c3f7506b26db8e6a8 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1c2439ffc1e407ff69286817d22f127470ce07ba..4257352ca30c2bf6de2c2cc700f9799263ae7c7e 100644 +index d74f885fcdf686359f761aa7356fe03cf293ee59..31b08d0c879ca7af6e186bf93095cd01e2565fcf 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -176,6 +176,14 @@ public class Main { - .describedAs("Jar file"); - // Paper end - +@@ -183,6 +183,13 @@ public class Main { + .defaultsTo(new File("pufferfish.yml")) + .describedAs("Yml file"); + // Purpur end - Fix pufferfish issues + // Purpur start - Purpur config files + acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings") + .withRequiredArg() @@ -173,7 +173,6 @@ index 1c2439ffc1e407ff69286817d22f127470ce07ba..4257352ca30c2bf6de2c2cc700f97992 + .defaultsTo(new File("purpur.yml")) + .describedAs("Yml file"); + // Purpur end - Purpur config files -+ // Paper start acceptsAll(asList("server-name"), "Name of the server") .withRequiredArg() diff --git a/patches/server/0024-Disable-outdated-build-check.patch b/patches/server/0024-Disable-outdated-build-check.patch index e5bb0daee..d4f561507 100644 --- a/patches/server/0024-Disable-outdated-build-check.patch +++ b/patches/server/0024-Disable-outdated-build-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ae274a56f7cb6200b3c556ed61254bb28146c771..628f7f784c830189c5718a20ce43a9352e400c33 100644 +index 31b08d0c879ca7af6e186bf93095cd01e2565fcf..10aa600fab7146b330d46b5fd2fe596da222a70a 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -267,7 +267,7 @@ public class Main { +@@ -273,7 +273,7 @@ public class Main { System.setProperty(net.minecrell.terminalconsole.TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper } diff --git a/patches/server/0114-Implement-TPSBar.patch b/patches/server/0114-Implement-TPSBar.patch index dccace9c9..ea93d7622 100644 --- a/patches/server/0114-Implement-TPSBar.patch +++ b/patches/server/0114-Implement-TPSBar.patch @@ -17,7 +17,7 @@ index 719fbce359f8c2c52ee4e9da3dfe9566f58c0346..f01fff591efc92267d96084660f9e968 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 16ab1d7735789d69f265092151db696d8f23f071..5ed363f80c7071995d24c8de1dd7ce7c88cdf6b6 100644 +index 0b89eeab47d143b260aa5f8bb10197a95f4045e2..95350ac6f92c52918f4b760bb4f63f1720151db1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1159,6 +1159,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sun, 12 Jun 2022 09:18:57 -0500 -Subject: [PATCH] Make pufferfish config relocatable - - -diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index 68fec1c808a16ecbf2451daa3bb8f02c1bdfe7c4..d13a5e0e1611222cd7b1f69bd279d44f2f4e12af 100644 ---- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -@@ -25,6 +25,7 @@ public class PufferfishConfig { - - private static final YamlFile config = new YamlFile(); - private static int updates = 0; -+ public static File pufferfishFile; // Purpur - Make pufferfish config relocatable - - private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) { - ConfigurationSection newSection = new MemoryConfiguration(); -@@ -47,7 +48,7 @@ public class PufferfishConfig { - } - - public static void load() throws IOException { -- File configFile = new File("pufferfish.yml"); -+ File configFile = pufferfishFile; // Purpur - Make pufferfish config relocatable - - if (configFile.exists()) { - try { -diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 8bb2f70c448c9cffd9db8e44191ecfe4d4d40332..254fa06064283e91aa420363c4c64433363aadd5 100644 ---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -254,6 +254,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - org.purpurmc.purpur.PurpurConfig.registerCommands(); - // Purpur end - Purpur config files - com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now -+ gg.pufferfish.pufferfish.PufferfishConfig.pufferfishFile = (java.io.File) options.valueOf("pufferfish-settings"); // Purpur - Make pufferfish config relocatable - gg.pufferfish.pufferfish.PufferfishConfig.load(); // Pufferfish - gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish - -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 9056939185e8d6fe876a651b9154389c682ea4a6..c47001b02776d68f2f189177ddda5d1eb12ba777 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -182,6 +182,12 @@ public class Main { - .ofType(File.class) - .defaultsTo(new File("purpur.yml")) - .describedAs("Yml file"); -+ -+ acceptsAll(asList("pufferfish", "pufferfish-settings"), "File for pufferfish settings") -+ .withRequiredArg() -+ .ofType(File.class) -+ .defaultsTo(new File("pufferfish.yml")) -+ .describedAs("Yml file"); - // Purpur end - Purpur config files - - // Paper start diff --git a/patches/server/0259-Configurable-block-blast-resistance.patch b/patches/server/0258-Configurable-block-blast-resistance.patch similarity index 96% rename from patches/server/0259-Configurable-block-blast-resistance.patch rename to patches/server/0258-Configurable-block-blast-resistance.patch index 96209afe8..89b81960b 100644 --- a/patches/server/0259-Configurable-block-blast-resistance.patch +++ b/patches/server/0258-Configurable-block-blast-resistance.patch @@ -18,7 +18,7 @@ index 6376b8b3ff444f4cab93e2bb5d2becc77c33c118..c8ae6e4cd74549f753ec04def5d882de protected final SoundType soundType; protected final float friction; diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 7164788c20483a78a92ccdcf480bd95651d84825..a282e1a0c832174a70c7b317f547c5d250fe37ad 100644 +index dca02d697dd0982b006d4d975e7df745ab62dac5..87ae04dff2645ba058325077cae4bcb20c7eab40 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -498,4 +498,19 @@ public class PurpurConfig { diff --git a/patches/server/0260-Configurable-block-fall-damage-modifiers.patch b/patches/server/0259-Configurable-block-fall-damage-modifiers.patch similarity index 97% rename from patches/server/0260-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0259-Configurable-block-fall-damage-modifiers.patch index 6a92ca4e0..ed1d695c4 100644 --- a/patches/server/0260-Configurable-block-fall-damage-modifiers.patch +++ b/patches/server/0259-Configurable-block-fall-damage-modifiers.patch @@ -18,7 +18,7 @@ index db79ef24ea01db5f619ab29700d3d391438fb742..54836f2a1e4cc9046ba29fb71ea237b3 @Override diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index b0fbadd0d6ec3e34e36c9f33ed89a3c315dc4289..91e68335d7007e3c1fe13eec0060db01c5f659ac 100644 +index 7531381e2e4d87ceeaa6478e13b23f6c072bef07..f00526753a83f95689fad2a132bef79f4479eec6 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -88,6 +88,10 @@ public class Block extends BlockBehaviour implements ItemLike { @@ -54,7 +54,7 @@ index ef364aa171a48482a45bc18cfe730ec20c3f7be6..74971d90506aa253d5ee821b5390fb25 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index a282e1a0c832174a70c7b317f547c5d250fe37ad..1d4fb426bfba5f572785c5a904d01be8edf23f24 100644 +index 87ae04dff2645ba058325077cae4bcb20c7eab40..d32eaca6dbb258187086d11038f8c78c00b1778d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -513,4 +513,50 @@ public class PurpurConfig { diff --git a/patches/server/0261-Language-API.patch b/patches/server/0260-Language-API.patch similarity index 93% rename from patches/server/0261-Language-API.patch rename to patches/server/0260-Language-API.patch index a05003fa2..269543c15 100644 --- a/patches/server/0261-Language-API.patch +++ b/patches/server/0260-Language-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Language API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6b0308d081af880a79c369306e8ad69757bcd6de..81922bf93f8a96e6cf05944ca98a82cc5945a6c6 100644 +index b9f72ee3201e1d1d7d90df055ef4876f0bd27219..badf280a6b01b06e8148c552330872d64e6256b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -426,6 +426,20 @@ public final class CraftServer implements Server { diff --git a/patches/server/0262-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0261-Milk-Keeps-Beneficial-Effects.patch similarity index 100% rename from patches/server/0262-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0261-Milk-Keeps-Beneficial-Effects.patch diff --git a/patches/server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0262-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0262-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0264-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0263-Add-log-suppression-for-LibraryLoader.patch similarity index 94% rename from patches/server/0264-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0263-Add-log-suppression-for-LibraryLoader.patch index 9ca459559..303104ce4 100644 --- a/patches/server/0264-Add-log-suppression-for-LibraryLoader.patch +++ b/patches/server/0263-Add-log-suppression-for-LibraryLoader.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 1d4fb426bfba5f572785c5a904d01be8edf23f24..4e47c24adb808feee415ee3e1c159955a7be5c71 100644 +index d32eaca6dbb258187086d11038f8c78c00b1778d..99cccf7c0e4928b47c2a43239475208003781d49 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -471,11 +471,14 @@ public class PurpurConfig { diff --git a/patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0264-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 96% rename from patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0264-Add-an-option-to-fix-MC-3304-projectile-looting.patch index 5370b128d..6ce4e9fff 100644 --- a/patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch +++ b/patches/server/0264-Add-an-option-to-fix-MC-3304-projectile-looting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add an option to fix MC-3304 (projectile looting) diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index f4f2581faba3f8686592f3f8ebbcdba3e5d30f7b..2f56d25fe4dce613f078455bd0150c6140df7fff 100644 +index d2a8e0fb1e673cec5701fd184cedfd8e49212acd..e136738ed53a488ad0aa67a04237ac6243fe712c 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -82,6 +82,7 @@ public abstract class AbstractArrow extends Projectile { @@ -73,7 +73,7 @@ index 5f27e1ce23f2ed68e4c8af1986fafce940dbf826..d8cf49cbd82ed12d23fa10a81a88cc4b return stack; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 4e47c24adb808feee415ee3e1c159955a7be5c71..b5724a0646f2194591d0c8539b87a850ad1bb5db 100644 +index 99cccf7c0e4928b47c2a43239475208003781d49..8cbce0cb8fa811edf01af3dbdf69c8abd795b348 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -502,6 +502,11 @@ public class PurpurConfig { diff --git a/patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0265-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0265-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/server/0267-Fire-Immunity-API.patch b/patches/server/0266-Fire-Immunity-API.patch similarity index 93% rename from patches/server/0267-Fire-Immunity-API.patch rename to patches/server/0266-Fire-Immunity-API.patch index 3f639b2ea..44d9510bf 100644 --- a/patches/server/0267-Fire-Immunity-API.patch +++ b/patches/server/0266-Fire-Immunity-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7435ff1996e0a6db2f98f1218bf7d2b73a3e2b1d..1832f7ef8a14fb60e004cb7b99a0cd0155332349 100644 +index 766301a14033fcc6b9270e556b9c08e019996530..e6d662b9e8d50abd9160aeaea705abc8310eb3b5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -393,6 +393,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -50,7 +50,7 @@ index 7435ff1996e0a6db2f98f1218bf7d2b73a3e2b1d..1832f7ef8a14fb60e004cb7b99a0cd01 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT"); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d4396ece618c0fec437ed915ce07be3fb5f7dca9..1290c1587fe9e39d9350c1079ab27f3be0c6084f 100644 +index f9d7f1d317a9534d471a481db8c26f9d3b15bfda..0e1b3f64d1a828b9c69efe45c511582880bdcb92 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -88,6 +88,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -71,7 +71,7 @@ index d4396ece618c0fec437ed915ce07be3fb5f7dca9..1290c1587fe9e39d9350c1079ab27f3b public boolean isInDaylight() { return getHandle().isSunBurnTick(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 01e4395f1669d21c30465aa1366bd2f1ae17678f..5c1cda88080850314dac196dbe71ff12e48a8aca 100644 +index 74f5b702b9602e4c8acbad4fb09c641e2c7844b2..762be3721419bfe33ea6577d3c6961204fdb0037 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -173,9 +173,14 @@ public class CraftItem extends CraftEntity implements Item { diff --git a/patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0267-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 100% rename from patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0267-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch diff --git a/patches/server/0269-Added-got-ram-event.patch b/patches/server/0268-Added-got-ram-event.patch similarity index 100% rename from patches/server/0269-Added-got-ram-event.patch rename to patches/server/0268-Added-got-ram-event.patch diff --git a/patches/server/0270-Log-skipped-entity-s-position.patch b/patches/server/0269-Log-skipped-entity-s-position.patch similarity index 91% rename from patches/server/0270-Log-skipped-entity-s-position.patch rename to patches/server/0269-Log-skipped-entity-s-position.patch index c2cfa2ac9..3146d795b 100644 --- a/patches/server/0270-Log-skipped-entity-s-position.patch +++ b/patches/server/0269-Log-skipped-entity-s-position.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Log skipped entity's position diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 2f08747612bd238f12c8d3dccb996118e7c34e33..a3ae5e663a0334eaa8ca6ce89c3088620a849bb9 100644 +index bf82c21b144c88f95991dbd7cb575839d8bd8e57..d09664949f924b4bd240abcc4a9f96f142310aa9 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -693,6 +693,12 @@ public class EntityType implements FeatureElement, EntityTypeT diff --git a/patches/server/0271-End-Crystal-Cramming.patch b/patches/server/0270-End-Crystal-Cramming.patch similarity index 100% rename from patches/server/0271-End-Crystal-Cramming.patch rename to patches/server/0270-End-Crystal-Cramming.patch diff --git a/patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0271-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 97% rename from patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0271-Option-to-allow-beacon-effects-when-covered-by-tinte.patch index eccdcbf07..3a06dee38 100644 --- a/patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch +++ b/patches/server/0271-Option-to-allow-beacon-effects-when-covered-by-tinte.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to allow beacon effects when covered by tinted glass diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index fbc6b0099af34b0247f6144a9cef020f9ccddeef..2d190b3a6378b8cbadfa65510df1ccfbd5882ef8 100644 +index 15a24cad5700cc1fe7430e425909869be84fe928..98e3d0a6f1be8cef8678b4048a3a484012092f08 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -178,6 +178,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0272-Add-attribute-clamping-and-armor-limit-config.patch similarity index 97% rename from patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0272-Add-attribute-clamping-and-armor-limit-config.patch index 2c3085cd6..572284de5 100644 --- a/patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch +++ b/patches/server/0272-Add-attribute-clamping-and-armor-limit-config.patch @@ -39,7 +39,7 @@ index f0703302e7dbbda88de8c648d20d87c55ed9b1e0..a913ebabaa5f443afa987b972355a8f8 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index b5724a0646f2194591d0c8539b87a850ad1bb5db..334bcf9f24c6b658664424fd960dad6fb9e28c7d 100644 +index 8cbce0cb8fa811edf01af3dbdf69c8abd795b348..535c7d6298ca62ea1bf808ac8deec1d2381b3831 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -507,6 +507,16 @@ public class PurpurConfig { diff --git a/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0273-Config-to-remove-explosion-radius-clamp.patch similarity index 100% rename from patches/server/0274-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0273-Config-to-remove-explosion-radius-clamp.patch diff --git a/patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0274-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 100% rename from patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0274-bonemealable-sugarcane-cactus-and-netherwart.patch diff --git a/patches/server/0276-Add-PreExplodeEvents.patch b/patches/server/0275-Add-PreExplodeEvents.patch similarity index 95% rename from patches/server/0276-Add-PreExplodeEvents.patch rename to patches/server/0275-Add-PreExplodeEvents.patch index b73e69bc0..5b9aefa41 100644 --- a/patches/server/0276-Add-PreExplodeEvents.patch +++ b/patches/server/0275-Add-PreExplodeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PreExplodeEvents diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 15a3849922664b85fa6bc9101c2af380d57ea0f3..e2763ee67530074d8ec78fbff694eb84f5373de0 100644 +index 05fdb02b6f73c24f6985755effecf92c0b365cf0..4c7e4683c53afb0800b7f17c5964ba8ff31848d1 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -670,6 +670,23 @@ public class ServerExplosion implements Explosion { diff --git a/patches/server/0277-Improve-output-of-plugins-command.patch b/patches/server/0276-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0277-Improve-output-of-plugins-command.patch rename to patches/server/0276-Improve-output-of-plugins-command.patch diff --git a/patches/server/0278-Make-GUI-Great-Again.patch b/patches/server/0277-Make-GUI-Great-Again.patch similarity index 99% rename from patches/server/0278-Make-GUI-Great-Again.patch rename to patches/server/0277-Make-GUI-Great-Again.patch index f4e7508d5..920ec5b45 100644 --- a/patches/server/0278-Make-GUI-Great-Again.patch +++ b/patches/server/0277-Make-GUI-Great-Again.patch @@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..15a226e3854d731f7724025ea3459c8a + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 08a81a45371fd273fb35956bef3bb7947bb4c5b6..7a442fb4cf78bcb1268359ee41a6de138edb76b6 100644 +index 07ec10fe4c96d0fd2a5f8a3df11c37cda7fff76a..0a579af1f1ecd6e73a8440e6821c41338dd28829 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -111,6 +111,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0279-Stored-Bee-API.patch b/patches/server/0278-Stored-Bee-API.patch similarity index 100% rename from patches/server/0279-Stored-Bee-API.patch rename to patches/server/0278-Stored-Bee-API.patch diff --git a/patches/server/0280-Shears-can-defuse-TNT.patch b/patches/server/0279-Shears-can-defuse-TNT.patch similarity index 100% rename from patches/server/0280-Shears-can-defuse-TNT.patch rename to patches/server/0279-Shears-can-defuse-TNT.patch diff --git a/patches/server/0281-Explorer-Map-API.patch b/patches/server/0280-Explorer-Map-API.patch similarity index 100% rename from patches/server/0281-Explorer-Map-API.patch rename to patches/server/0280-Explorer-Map-API.patch diff --git a/patches/server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0281-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 100% rename from patches/server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0281-Option-Ocelot-Spawn-Under-Sea-Level.patch diff --git a/patches/server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0282-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 100% rename from patches/server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0282-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch diff --git a/patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0283-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 100% rename from patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0283-Add-option-for-always-showing-item-in-player-death-m.patch diff --git a/patches/server/0285-place-end-crystal-on-any-block.patch b/patches/server/0284-place-end-crystal-on-any-block.patch similarity index 100% rename from patches/server/0285-place-end-crystal-on-any-block.patch rename to patches/server/0284-place-end-crystal-on-any-block.patch diff --git a/patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0285-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 96% rename from patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0285-Add-option-to-disable-the-copper-oxidation-proximity.patch index 82df86634..46c6e1a71 100644 --- a/patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch +++ b/patches/server/0285-Add-option-to-disable-the-copper-oxidation-proximity.patch @@ -18,7 +18,7 @@ index daae7fd6e0148cfba8e359d990748a0c83a3376e..0e06b1bcd906e92c083dc74d56d6d0a2 return random.nextFloat() < f1 ? this.getNext(state) : Optional.empty(); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c9ad3129146f5f29f1a1d0afbbc911d92bb4e8fb..9b3e2d1ab8ad0b388a0bd3947feea43e602b8781 100644 +index 552993124deefef3b9875608cea545b3a97b8bc6..b59e74ec85573ced20a47f0f732608d057511e2d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -146,6 +146,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0287-register-minecraft-debug-commands.patch b/patches/server/0286-register-minecraft-debug-commands.patch similarity index 93% rename from patches/server/0287-register-minecraft-debug-commands.patch rename to patches/server/0286-register-minecraft-debug-commands.patch index 99c770e20..11a7ee369 100644 --- a/patches/server/0287-register-minecraft-debug-commands.patch +++ b/patches/server/0286-register-minecraft-debug-commands.patch @@ -5,7 +5,7 @@ Subject: [PATCH] register minecraft debug commands diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index db455a0fc7e1fc004215b718ff470bd2f74eae1b..8d82425ccbc30b3f4a59767ca72bf37311ddeda0 100644 +index 93c07a4c96e25ed1db5e1f721ab5d53192a0225f..fe9a01e19ef182fb8e9c653fc1232ec7f13037e4 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -226,8 +226,8 @@ public class Commands { @@ -32,7 +32,7 @@ index 978c0d7296f400fe2ebda89e4f61386e6e87fe0c..a880f4e5cf712654649ad043e58e073e io.papermc.paper.plugin.PluginInitializerManager.load(optionset); // Paper diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index e2b2eb66907f3a35792a59d68509abda1dd34ccb..8ceec24eeb4b441bcc37e75d4b6a778cc6184f31 100644 +index ab672b9041ae40ba3e78bc5f9f465ee70e420993..2d76827f83638c7f6bfa0d45bf950e18df22063e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -582,4 +582,9 @@ public class PurpurConfig { diff --git a/patches/server/0288-Configurable-villager-search-radius.patch b/patches/server/0287-Configurable-villager-search-radius.patch similarity index 100% rename from patches/server/0288-Configurable-villager-search-radius.patch rename to patches/server/0287-Configurable-villager-search-radius.patch diff --git a/patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0288-option-to-make-ravagers-afraid-of-rabbits.patch similarity index 100% rename from patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch rename to patches/server/0288-option-to-make-ravagers-afraid-of-rabbits.patch diff --git a/patches/server/0290-config-for-startup-commands.patch b/patches/server/0289-config-for-startup-commands.patch similarity index 92% rename from patches/server/0290-config-for-startup-commands.patch rename to patches/server/0289-config-for-startup-commands.patch index ba7680bc4..30677462c 100644 --- a/patches/server/0290-config-for-startup-commands.patch +++ b/patches/server/0289-config-for-startup-commands.patch @@ -5,7 +5,7 @@ Subject: [PATCH] config for startup commands diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 74d4bb12d70cbfd8365337c8fbcdbdfe6d70e970..0819adb34541e5a774f07616957c785b3d6cd8ea 100644 +index 827e8b9b0fb0fa64f56de54a562f65e200c7b50f..fa5f7bc53f3dfa5581f7c747c732ebc7737a7820 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1294,6 +1294,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop