From c0cf991b1c52bb933bdcb6bf2437ac8166ab1b28 Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 7 Mar 2026 15:21:44 -0800 Subject: [PATCH] apply all paper server patches --- .../0001-Rebrand.patch | 0 .../0002-Ridables.patch | 4 ++-- .../0003-Barrels-and-enderchests-6-rows.patch | 0 ...004-API-for-any-mob-to-burn-daylight.patch | 2 +- ...etting-to-reintroduce-end-void-rings.patch | 0 .../destroystokyo/paper/Metrics.java.patch | 12 ++-------- .../paper/console/PaperConsole.java.patch | 10 +-------- .../paper/entity/ai/MobGoalHelper.java.patch | 10 +-------- .../paper/gui/RAMDetails.java.patch | 12 ++-------- .../paper/ServerBuildInfoImpl.java.patch | 14 +++--------- .../command/PaperPluginsCommand.java.patch | 16 ++++---------- .../paper/logging/SysoutCatcher.java.patch | 10 +-------- .../craftbukkit/CraftOfflinePlayer.java.patch | 12 ++-------- .../bukkit/craftbukkit/CraftServer.java.patch | 22 ++++++------------- .../bukkit/craftbukkit/CraftWorld.java.patch | 10 +-------- .../org/bukkit/craftbukkit/Main.java.patch | 10 +-------- .../craftbukkit/block/CraftBeehive.java.patch | 14 +++--------- .../craftbukkit/block/CraftConduit.java.patch | 10 +-------- .../CraftConsoleCommandSender.java.patch | 12 ++-------- .../entity/CraftCopperGolem.java.patch | 10 +-------- .../entity/CraftEndermite.java.patch | 10 +-------- .../craftbukkit/entity/CraftEntity.java.patch | 10 +-------- .../entity/CraftHumanEntity.java.patch | 10 +++++++++ .../entity/CraftIronGolem.java.patch | 10 +-------- .../craftbukkit/entity/CraftItem.java.patch | 10 +-------- .../entity/CraftLivingEntity.java.patch | 10 +-------- .../craftbukkit/entity/CraftLlama.java.patch | 10 +-------- .../craftbukkit/entity/CraftPlayer.java.patch | 20 +++++------------ .../entity/CraftSnowman.java.patch | 10 +-------- .../entity/CraftVillager.java.patch | 14 ++++++++++++ .../craftbukkit/entity/CraftWither.java.patch | 10 +-------- .../craftbukkit/entity/CraftWolf.java.patch | 10 +-------- .../inventory/CraftInventoryAnvil.java.patch | 14 +++--------- .../inventory/CraftItemStack.java.patch | 10 +-------- .../inventory/CraftRecipe.java.patch | 10 +-------- .../inventory/view/CraftAnvilView.java.patch | 10 +-------- .../craftbukkit/legacy/CraftLegacy.java.patch | 10 +-------- .../legacy/MaterialRerouting.java.patch | 10 +-------- .../map/CraftMapRenderer.java.patch | 13 +++++++++++ .../scheduler/CraftScheduler.java.patch | 10 +-------- .../util/CraftMagicNumbers.java.patch | 11 ++++++++++ .../permissions/CommandPermissions.java.patch | 10 +-------- .../spigotmc/TicksPerSecondCommand.java.patch | 10 +-------- .../org/spigotmc/WatchdogThread.java.patch | 16 ++++---------- .../src/main/resources/log4j2.xml.patch | 10 +-------- ...MinecraftCommandPermissionsTest.java.patch | 12 ++-------- .../entity/CraftHumanEntity.java.patch | 18 --------------- .../entity/CraftVillager.java.patch | 22 ------------------- .../map/CraftMapRenderer.java.patch | 21 ------------------ .../util/CraftMagicNumbers.java.patch | 19 ---------------- 50 files changed, 116 insertions(+), 444 deletions(-) rename purpur-server/paper-patches/{unapplied-features => features}/0001-Rebrand.patch (100%) rename purpur-server/paper-patches/{unapplied-features => features}/0002-Ridables.patch (93%) rename purpur-server/paper-patches/{unapplied-features => features}/0003-Barrels-and-enderchests-6-rows.patch (100%) rename purpur-server/paper-patches/{unapplied-features => features}/0004-API-for-any-mob-to-burn-daylight.patch (96%) rename purpur-server/paper-patches/{unapplied-features => features}/0005-Setting-to-reintroduce-end-void-rings.patch (100%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/com/destroystokyo/paper/Metrics.java.patch (82%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch (51%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch (61%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch (66%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch (68%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch (90%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch (62%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch (92%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch (87%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch (82%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/Main.java.patch (63%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch (80%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch (51%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch (60%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch (53%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch (50%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch (57%) create mode 100644 purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch (55%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch (76%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch (61%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch (54%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch (87%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch (53%) create mode 100644 purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch (54%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch (59%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch (71%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch (94%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch (65%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch (59%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java.patch (56%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch (75%) create mode 100644 purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch (62%) create mode 100644 purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch (82%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch (56%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/java/org/spigotmc/WatchdogThread.java.patch (84%) rename purpur-server/paper-patches/{unapplied-files => files}/src/main/resources/log4j2.xml.patch (74%) rename purpur-server/paper-patches/{unapplied-files => files}/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch (73%) delete mode 100644 purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch delete mode 100644 purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch delete mode 100644 purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch delete mode 100644 purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch diff --git a/purpur-server/paper-patches/unapplied-features/0001-Rebrand.patch b/purpur-server/paper-patches/features/0001-Rebrand.patch similarity index 100% rename from purpur-server/paper-patches/unapplied-features/0001-Rebrand.patch rename to purpur-server/paper-patches/features/0001-Rebrand.patch diff --git a/purpur-server/paper-patches/unapplied-features/0002-Ridables.patch b/purpur-server/paper-patches/features/0002-Ridables.patch similarity index 93% rename from purpur-server/paper-patches/unapplied-features/0002-Ridables.patch rename to purpur-server/paper-patches/features/0002-Ridables.patch index 79c94bb84..1da6553d6 100644 --- a/purpur-server/paper-patches/unapplied-features/0002-Ridables.patch +++ b/purpur-server/paper-patches/features/0002-Ridables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ridables diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 2f940ec42f4d657e40f4da1d974f46c87837a48c..da588e4622aac635ecc2205ea09ceb9722cd59c9 100644 +index c5a866735d7d918ea58306ea2299a8b82be52f3f..d6ddbcff911ce4c97a20883af10d2b4752b63f55 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1343,4 +1343,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -36,7 +36,7 @@ index 2f940ec42f4d657e40f4da1d974f46c87837a48c..da588e4622aac635ecc2205ea09ceb97 + // Purpur end - Ridables } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 0cc84ce2074734a910599cdc66d7ddad3b081a76..690181c032667326c2e9c7edf678b2cdcd319c64 100644 +index 2618ace4a77efb66f94a5b0755dd60f14626e343..7297e8cee2831069530c3266aed0bdb43d344280 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -653,6 +653,15 @@ public class CraftEventFactory { diff --git a/purpur-server/paper-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from purpur-server/paper-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch rename to purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch diff --git a/purpur-server/paper-patches/unapplied-features/0004-API-for-any-mob-to-burn-daylight.patch b/purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch similarity index 96% rename from purpur-server/paper-patches/unapplied-features/0004-API-for-any-mob-to-burn-daylight.patch rename to purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch index 45e0399b4..5831b896f 100644 --- a/purpur-server/paper-patches/unapplied-features/0004-API-for-any-mob-to-burn-daylight.patch +++ b/purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch @@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index da588e4622aac635ecc2205ea09ceb9722cd59c9..d04ff11b293c458fd4f18f04336421e5e183c3f4 100644 +index d6ddbcff911ce4c97a20883af10d2b4752b63f55..7db0454a8c9251faa815500c307d116b9303b236 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -126,6 +126,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/purpur-server/paper-patches/unapplied-features/0005-Setting-to-reintroduce-end-void-rings.patch b/purpur-server/paper-patches/features/0005-Setting-to-reintroduce-end-void-rings.patch similarity index 100% rename from purpur-server/paper-patches/unapplied-features/0005-Setting-to-reintroduce-end-void-rings.patch rename to purpur-server/paper-patches/features/0005-Setting-to-reintroduce-end-void-rings.patch diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/Metrics.java.patch b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch similarity index 82% rename from purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/Metrics.java.patch rename to purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch index a852c8ac2..4d41a9d45 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/Metrics.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/Metrics.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 9f4d73fd321f6f0cd19fdd1b63068d2ea6c0816b..6194d6d8952864c71cc4017a639b818e4ecccea9 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -593,7 +593,7 @@ public class Metrics { +@@ -593,7 +_,7 @@ boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { @@ -17,7 +9,7 @@ index 9f4d73fd321f6f0cd19fdd1b63068d2ea6c0816b..6194d6d8952864c71cc4017a639b818e metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); -@@ -602,16 +602,8 @@ public class Metrics { +@@ -602,16 +_,8 @@ })); metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch similarity index 51% rename from purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch rename to purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch index 5234aa5eb..43b5c7a41 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/console/PaperConsole.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 6ee39b534b8d992655bc0cef3c299d12cbae0034..bc7e4e5560708fea89c584b1d8b471f4966f311a 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -@@ -20,7 +20,7 @@ public final class PaperConsole extends SimpleTerminalConsole { +@@ -20,7 +_,7 @@ @Override protected LineReader buildReader(LineReaderBuilder builder) { builder diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch similarity index 61% rename from purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch rename to purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch index b076f5334..5c11cc994 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index c8583cb0bc5a1ce00fa96173097434ed9d1cf781..9fa130bf030bb829a087c2ed9ece99c90182f74e 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -@@ -148,6 +148,11 @@ public class MobGoalHelper { +@@ -147,6 +_,11 @@ private static final Map RENAMES = Util.make(new HashMap<>(), map -> { map.put("AbstractSkeleton$1", "AbstractSkeletonMelee"); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch similarity index 66% rename from purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch rename to purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch index 779553e11..795d9b9f2 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -index 9863aed2417e494c44275ba2bb378f641c6e75a4..3152a50e0bcaa5edf1506aa825d0caa37c4b9bf6 100644 --- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java +++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -@@ -60,7 +60,7 @@ public class RAMDetails extends JList { +@@ -60,7 +_,7 @@ Vector vector = new Vector<>(); // Follows CraftServer#getTPS @@ -17,7 +9,7 @@ index 9863aed2417e494c44275ba2bb378f641c6e75a4..3152a50e0bcaa5edf1506aa825d0caa3 String[] tpsAvg = new String[tps.length]; for ( int g = 0; g < tps.length; g++) { -@@ -69,7 +69,7 @@ public class RAMDetails extends JList { +@@ -69,7 +_,7 @@ vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)"); vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb"); vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms"); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch b/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch similarity index 68% rename from purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch rename to purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch index 1cbebeb5b..13971e34d 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f40505c98 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java -@@ -31,6 +31,7 @@ public record ServerBuildInfoImpl( +@@ -31,6 +_,7 @@ private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit"; private static final String BRAND_PAPER_NAME = "Paper"; @@ -16,7 +8,7 @@ index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f private static final String BUILD_DEV = "DEV"; -@@ -42,9 +43,9 @@ public record ServerBuildInfoImpl( +@@ -42,9 +_,9 @@ this( getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID) .map(Key::key) @@ -28,7 +20,7 @@ index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..1b0ee48e28aaa68ddb1f28c23d3c5f5f SharedConstants.getCurrentVersion().id(), SharedConstants.getCurrentVersion().name(), getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER) -@@ -61,7 +62,7 @@ public record ServerBuildInfoImpl( +@@ -61,7 +_,7 @@ @Override public boolean isBrandCompatible(final @NotNull Key brandId) { diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch b/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch similarity index 90% rename from purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch rename to purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch index 8ebddbb34..2b8d161ef 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb515f34e3 100644 --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java -@@ -74,10 +74,10 @@ public class PaperPluginsCommand { +@@ -74,10 +_,10 @@ .build(); } @@ -21,7 +13,7 @@ index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb } boolean isFirst = true; -@@ -104,15 +104,49 @@ public class PaperPluginsCommand { +@@ -104,15 +_,49 @@ return formattedSubLists; } @@ -74,7 +66,7 @@ index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb builder.append(pluginName); -@@ -130,6 +164,23 @@ public class PaperPluginsCommand { +@@ -130,6 +_,23 @@ return componentHeader.append(Component.text(":")).build(); } @@ -98,7 +90,7 @@ index 9c49bb7fb8c3ca4b62e73dcfca2669971defb181..727253cb847e56e8716bc6b17512c0eb private static Component asPlainComponents(final String strings) { final net.kyori.adventure.text.TextComponent.Builder builder = Component.text(); for (final String string : strings.split("\n")) { -@@ -188,25 +239,25 @@ public class PaperPluginsCommand { +@@ -188,25 +_,25 @@ final int sizePaperPlugins = paperPlugins.size(); final int sizeSpigotPlugins = spigotPlugins.size(); final int sizePlugins = sizePaperPlugins + sizeSpigotPlugins; diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch b/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch similarity index 62% rename from purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch rename to purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch index 53af91f74..d8d9954f6 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/io/papermc/paper/logging/SysoutCatcher.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java -index a8e813ca89b033f061e695288b3383bdcf128531..96a377a07d8396f893954a3ba97fbf88d73faf6d 100644 --- a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java +++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java -@@ -54,9 +54,9 @@ public final class SysoutCatcher { +@@ -54,9 +_,9 @@ final JavaPlugin plugin = JavaPlugin.getProvidingPlugin(clazz); // Instead of just printing the message, send it to the plugin's logger diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch similarity index 92% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch index 995979f40..c9e217b4e 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 97b097eca4f1de247adb7db5591575b96a9fe3b6..7283eb950a0d1c92c451a0379d7a409d147bb84c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -@@ -342,6 +342,12 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa +@@ -342,6 +_,12 @@ @Override public Location getLocation() { @@ -21,7 +13,7 @@ index 97b097eca4f1de247adb7db5591575b96a9fe3b6..7283eb950a0d1c92c451a0379d7a409d CompoundTag data = this.getData(); if (data == null) { return null; -@@ -579,4 +585,183 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa +@@ -579,4 +_,183 @@ manager.save(); } } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch similarity index 87% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch index 9a83e87e2..907c0266d 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e577dba92f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -417,6 +417,20 @@ public final class CraftServer implements Server { +@@ -419,6 +_,20 @@ this.paperPluginManager = new io.papermc.paper.plugin.manager.PaperPluginManagerImpl(this, this.commandMap, pluginManager); this.pluginManager.paperPluginManager = this.paperPluginManager; // Paper end @@ -29,7 +21,7 @@ index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e5 CraftRegistry.setMinecraftRegistry(console.registryAccess()); -@@ -992,6 +1006,7 @@ public final class CraftServer implements Server { +@@ -994,6 +_,7 @@ org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot this.console.paperConfigurations.reloadConfigs(this.console); @@ -37,7 +29,7 @@ index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e5 for (ServerLevel world : this.console.getAllLevels()) { // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty world.setSpawnSettings(world.isSpawningMonsters()); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean)) -@@ -1007,6 +1022,7 @@ public final class CraftServer implements Server { +@@ -1009,6 +_,7 @@ } } world.spigotConfig.init(); // Spigot @@ -45,7 +37,7 @@ index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e5 } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper -@@ -1024,6 +1040,7 @@ public final class CraftServer implements Server { +@@ -1026,6 +_,7 @@ org.spigotmc.SpigotConfig.registerCommands(); // Spigot io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper this.spark.registerCommandBeforePlugins(this); // Paper - spark @@ -53,7 +45,7 @@ index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e5 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -1484,6 +1501,60 @@ public final class CraftServer implements Server { +@@ -1491,6 +_,60 @@ return true; } @@ -114,7 +106,7 @@ index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e5 @Override public List getRecipesFor(ItemStack result) { Preconditions.checkArgument(result != null, "ItemStack cannot be null"); -@@ -2729,6 +2800,18 @@ public final class CraftServer implements Server { +@@ -2736,6 +_,18 @@ return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console); } @@ -133,7 +125,7 @@ index da49c8005592a154946750591ce082796f24dd3b..45cb1ef06f0daa266e60fdba4f88b5e5 @Override public void restart() { CraftServer.this.restart(); -@@ -2964,4 +3047,18 @@ public final class CraftServer implements Server { +@@ -2971,4 +_,18 @@ public void allowPausing(final Plugin plugin, final boolean value) { this.console.addPluginAllowingSleep(plugin.getName(), value); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch similarity index 82% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch index 317071543..df14d6c73 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ebc65e3338c646815416a47bf9af96fe45978caf..01719a81cea75654a0d7eac52fd43ebf2d692b9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1926,6 +1926,52 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1924,6 +_,52 @@ return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/Main.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch similarity index 63% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/Main.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch index 9b3ad91e4..90b5a610d 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/Main.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/Main.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 8ce8de8eedfe8557848b0508857744a5b9641239..e6ea34b18c6db63efa77bb67d3484e4d66315ed6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -139,6 +139,14 @@ public class Main { +@@ -169,6 +_,14 @@ .defaultsTo(new File[] {}) .describedAs("Plugin directory"); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch similarity index 80% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch index 45b98c420..b2fe7e396 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java -index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4adb819d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java -@@ -16,8 +16,15 @@ import org.bukkit.entity.Bee; +@@ -16,8 +_,15 @@ public class CraftBeehive extends CraftBlockEntityState implements Beehive { @@ -24,7 +16,7 @@ index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4 } protected CraftBeehive(CraftBeehive state, Location location) { -@@ -76,14 +83,54 @@ public class CraftBeehive extends CraftBlockEntityState impl +@@ -76,14 +_,54 @@ } } @@ -79,7 +71,7 @@ index ed4692090a115d3d0a0826b10f77e903058eeec6..205c367fd5e2921d36f78ac7df5999d4 } @Override -@@ -100,6 +147,7 @@ public class CraftBeehive extends CraftBlockEntityState impl +@@ -100,6 +_,7 @@ @Override public void clearEntities() { getSnapshot().clearBees(); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch similarity index 51% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch index 61a4f71ee..7ce19fa24 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -index 1c448bc38fa554707e0bfb99ded70b093e49926c..77e6913358ac992b503712cccb871518770fee0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -@@ -75,7 +75,7 @@ public class CraftConduit extends CraftBlockEntityState impl +@@ -75,7 +_,7 @@ public int getRange() { this.ensureNoWorldGeneration(); ConduitBlockEntity conduit = (ConduitBlockEntity) this.getBlockEntityFromWorld(); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch similarity index 60% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch index 0c3ecd6fa..18d1a9162 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java -index 6e2f931b06d4ef702e0abf609a5f5bba780c5b7a..15ae2653c1809041b7ab7cb67015e82c226e9f77 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftConsoleCommandSender.java -@@ -21,7 +21,12 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co +@@ -21,7 +_,12 @@ @Override public void sendMessage(String message) { @@ -22,7 +14,7 @@ index 6e2f931b06d4ef702e0abf609a5f5bba780c5b7a..15ae2653c1809041b7ab7cb67015e82c } @Override -@@ -88,7 +93,7 @@ public class CraftConsoleCommandSender extends ServerCommandSender implements Co +@@ -88,7 +_,7 @@ @Override public void sendMessage(final net.kyori.adventure.identity.Identity identity, final net.kyori.adventure.text.Component message, final net.kyori.adventure.audience.MessageType type) { diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch similarity index 53% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch index 6d0d84aee..09805819f 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java -index f61abf0ecad0b5be477b0f3e8232c20789614986..1204ebdf76f0b54b8d0ff75f192d88a599d6317a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCopperGolem.java -@@ -67,4 +67,17 @@ public class CraftCopperGolem extends CraftGolem implements CopperGolem, PaperSh +@@ -67,4 +_,17 @@ default -> throw new IllegalStateException("Unexpected value: " + oxidizing); } } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch similarity index 50% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch index 8bf141c13..e28023a49 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java -index 000c5ea5d39d5ab6e5592012ab1cc7ee547505dc..140da7078217f833f490d88faaf803ab1763115d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java -@@ -16,12 +16,12 @@ public class CraftEndermite extends CraftMonster implements Endermite { +@@ -16,12 +_,12 @@ @Override public boolean isPlayerSpawned() { diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch similarity index 57% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch index 39ade180d..8fd4ad85d 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 2a572ef0ba7405ecafaf6def2a2134bd71b60453..2f940ec42f4d657e40f4da1d974f46c87837a48c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -114,6 +114,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -114,6 +_,18 @@ this.entityType = CraftEntityType.minecraftToBukkit(entity.getType()); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch new file mode 100644 index 000000000..c8c0b7a9a --- /dev/null +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch @@ -0,0 +1,10 @@ +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +@@ -291,6 +_,7 @@ + @Override + public void recalculatePermissions() { + this.perm.recalculatePermissions(); ++ getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur - Add portal permission bypass + } + + @Override diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch similarity index 55% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch index 318f6ce5b..6acff6eeb 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java -index 54cea2ff4abbb3780814aadc534e53cd97022971..e0a5b55005fd8a6ff16c7d13fff9caea1d836f66 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java -@@ -22,4 +22,17 @@ public class CraftIronGolem extends CraftGolem implements IronGolem { +@@ -22,4 +_,17 @@ public void setPlayerCreated(boolean playerCreated) { this.getHandle().setPlayerCreated(playerCreated); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch similarity index 76% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch index ed113bfff..7a2d0a451 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index d849e22060d0ec6d4b4ca8079ac5cec26e1a1855..4efb73372b91b8c83a6c5a2b2cb099d229db0621 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -@@ -145,4 +145,53 @@ public class CraftItem extends CraftEntity implements Item { +@@ -145,4 +_,53 @@ public UUID getThrower() { return Optionull.map(this.getHandle().thrower, EntityReference::getUUID); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch similarity index 61% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch index 84480123a..8f51efee9 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index b0987314d2635d685129af70b4b02cba3075e594..4f31c5604639b4699631449569ba73d064f83dc3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -@@ -490,7 +490,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { +@@ -490,7 +_,7 @@ net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle(); this.getHandle().setLastHurtByMob(nmsKiller); if (nmsKiller != null) { diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch similarity index 54% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch index e066006a8..f185fa5ca 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 443146323ee54a3ea7191ffe3a065a6fabb8a0fb..f87b472c6747271dfec4152f7be0754b42b05845 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -@@ -86,4 +86,17 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys +@@ -86,4 +_,17 @@ public Llama getCaravanTail() { return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity(); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch similarity index 87% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch index 1aa25cf89..21f845824 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d86ebc4cd182076629eb8000267d7b1a38a06be1..225a88c6976de91b9115471e7942e5585e392ec4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -580,10 +580,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -584,10 +_,15 @@ @Override public void setPlayerListName(String name) { @@ -25,7 +17,7 @@ index d86ebc4cd182076629eb8000267d7b1a38a06be1..225a88c6976de91b9115471e7942e558 if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined for (ServerPlayer player : this.server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { -@@ -984,6 +989,80 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -988,6 +_,80 @@ } } @@ -106,10 +98,11 @@ index d86ebc4cd182076629eb8000267d7b1a38a06be1..225a88c6976de91b9115471e7942e558 @Override public void sendBlockDamage(Location loc, float progress, org.bukkit.entity.Entity source) { Preconditions.checkArgument(source != null, "source must not be null"); -@@ -2490,6 +2569,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -2495,6 +_,28 @@ + public float getWalkSpeed() { return this.getHandle().getAbilities().walkingSpeed * 2f; } - ++ + // Purpur start - OfflinePlayer API + @Override + public boolean teleportOffline(Location destination) { @@ -131,7 +124,6 @@ index d86ebc4cd182076629eb8000267d7b1a38a06be1..225a88c6976de91b9115471e7942e558 + return this.teleportAsync(destination, cause); + } + // Purpur end - OfflinePlayer API -+ + private void validateSpeed(float value) { Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value); - } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch similarity index 53% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch index f00b285d7..0c72e0175 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -index 0a912863fe9f5e07bfd51110a4f0124af92afbcf..ad1acb743abda5859071f795b34e8a958db6ba65 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -@@ -24,4 +24,17 @@ public class CraftSnowman extends CraftGolem implements Snowman, com.destroystok +@@ -24,4 +_,17 @@ public void setDerp(boolean derpMode) { this.getHandle().setPumpkin(!derpMode); } diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch new file mode 100644 index 000000000..d20a550a9 --- /dev/null +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch @@ -0,0 +1,14 @@ +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +@@ -240,4 +_,11 @@ + public void restock() { + getHandle().restock(); + } ++ ++ // Purpur start - Lobotomize stuck villagers ++ @Override ++ public boolean isLobotomized() { ++ return getHandle().isLobotomized(); ++ } ++ // Purpur end - Lobotomize stuck villagers + } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch similarity index 54% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch index f7a0a40ae..61556048d 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -index 2e11df97e5c8ff5fbf22ba87946d6018ac8bbbed..83b779eb0adcaf2e6d5658cddc2607f6deea6bb9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -@@ -92,4 +92,18 @@ public class CraftWither extends CraftMonster implements Wither, com.destroystok +@@ -92,4 +_,18 @@ public void enterInvulnerabilityPhase() { this.getHandle().makeInvulnerable(); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch similarity index 59% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch index 56470caa5..708b9bc1e 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java -index 1e24ae8526915154e270c297af1438ba82190755..a1f274dffbba4a5cdc5199c194c66da0dcae8912 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java -@@ -90,6 +90,18 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf { +@@ -90,6 +_,18 @@ this.getHandle().setSoundVariant(CraftSoundVariant.bukkitToMinecraftHolder(soundVariant)); } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch similarity index 71% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch index a5b67b1aa..58b895e59 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java -index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb51b87f39e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAnvil.java -@@ -19,6 +19,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn +@@ -19,6 +_,10 @@ private int repairCost; private int repairCostAmount; private int maximumRepairCost; @@ -19,7 +11,7 @@ index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb5 public CraftInventoryAnvil(Location location, Container inventory, Container resultInventory) { super(inventory, resultInventory); -@@ -27,6 +31,10 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn +@@ -27,6 +_,10 @@ this.repairCost = CraftInventoryAnvil.DEFAULT_REPAIR_COST; this.repairCostAmount = CraftInventoryAnvil.DEFAULT_REPAIR_COST_AMOUNT; this.maximumRepairCost = CraftInventoryAnvil.DEFAULT_MAXIMUM_REPAIR_COST; @@ -30,7 +22,7 @@ index 792cb6adf0c7a6335cc5985fce8bed2e0f1149af..5734c5caffda79383ae30df20c3defb5 } @Override -@@ -113,4 +121,30 @@ public class CraftInventoryAnvil extends CraftResultInventory implements AnvilIn +@@ -113,4 +_,30 @@ consumer.accept(cav); } } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch similarity index 94% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch index 5865b057b..0708b4d47 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 002682049fe890333794072e1e2717004f2ad0cf..388ec223420e0e3a9e975f216ecf1d86f097c66c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -672,4 +672,285 @@ public final class CraftItemStack extends ItemStack { +@@ -672,4 +_,285 @@ } // Paper end - data component API diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch similarity index 65% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch index 6aaa37ccf..d0024f75f 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java -index 833182cb6ee25868426e44850487a4f299223130..d16eb1cfd482ee8ee2a2b24ca8cbd139a68a10c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java -@@ -43,6 +43,7 @@ public interface CraftRecipe extends Recipe { +@@ -43,6 +_,7 @@ stack = Ingredient.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat))); } else if (bukkit instanceof RecipeChoice.ExactChoice) { stack = Ingredient.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList()); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch similarity index 59% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch index 792a36633..5d9234b7b 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java -index 2b3844f5ecc1bfbf3f5dab1c00d06f8be27f39e9..4e535c287137ceedd4d48047b03f4578c33467b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/view/CraftAnvilView.java -@@ -73,4 +73,26 @@ public class CraftAnvilView extends CraftInventoryView -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -index fc24964d8921755f773267e4592ea61b65c171bf..415781668036a9961eb8b992fd42a4633b729835 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java -@@ -260,6 +260,7 @@ public final class CraftLegacy { +@@ -260,6 +_,7 @@ } static { diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch similarity index 75% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch index 5cfdd503e..990500141 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java -index 9bc8055c36322c79077af57ab72d5493f5e65b7d..9f50bfc899d747f4e9287a646c6c6103bf501660 100644 --- a/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java +++ b/src/main/java/org/bukkit/craftbukkit/legacy/MaterialRerouting.java -@@ -703,4 +703,32 @@ public class MaterialRerouting { +@@ -703,4 +_,32 @@ meta.setCanPlaceOn(materials); } // Paper end diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch new file mode 100644 index 000000000..33ae859ed --- /dev/null +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch @@ -0,0 +1,13 @@ +--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java ++++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java +@@ -46,4 +_,10 @@ + } + } + ++ // Purpur start - Explorer Map API ++ @Override ++ public boolean isExplorerMap() { ++ return this.worldMap.isExplorerMap; ++ } ++ // Purpur end - Explorer Map API + } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch similarity index 62% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch index 064db6b97..46d23c417 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 7ffb7a210bf840009158d5e4364dad78221ded6c..554fc2c53b5028c8f89a0ae69a75e075ba4f4435 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -@@ -491,7 +491,7 @@ public class CraftScheduler implements BukkitScheduler { +@@ -491,7 +_,7 @@ this.parsePending(); } else { // this.debugTail = this.debugTail.setNext(new CraftAsyncDebugger(this.currentTick + CraftScheduler.RECENT_TICKS, task.getOwner(), task.getTaskClass())); // Paper diff --git a/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch new file mode 100644 index 000000000..b3ee98816 --- /dev/null +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch @@ -0,0 +1,11 @@ +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +@@ -486,7 +_,7 @@ + + @Override + public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { +- return new com.destroystokyo.paper.PaperVersionFetcher(); ++ return new org.purpurmc.purpur.PurpurVersionFetcher(); // Purpur - use old Paper version checker + } + + @Override diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch similarity index 82% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch index c71815e79..6106785b3 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java -index a454350085f2f9302a45787df8f26726cc1104a9..aa473abf6008620a1f46f4ecaea99e6ad9aeb689 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java -@@ -23,7 +23,15 @@ public final class CommandPermissions { +@@ -23,7 +_,15 @@ DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "kick", "Allows the user to kick players", PermissionDefault.OP, commands); DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "stop", "Allows the user to stop the server", PermissionDefault.OP, commands); DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch b/purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch similarity index 56% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch index fc0837915..3b87a8487 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/spigotmc/TicksPerSecondCommand.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -index 2756ca738b99792495f4fe6128b75e03f73936f1..2e252d9b1f8323670c91abe4832f1c63303fbf88 100644 --- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java -@@ -47,7 +47,7 @@ public class TicksPerSecondCommand extends Command { +@@ -47,7 +_,7 @@ } TextComponent.Builder builder = text(); diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/WatchdogThread.java.patch b/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch similarity index 84% rename from purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/WatchdogThread.java.patch rename to purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch index 44d89c2f9..7dc409927 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/spigotmc/WatchdogThread.java.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 5c1306ac6eb620a38ed5ef3632b611214e1d5dcd..048b96047ac737cf515682593d4632b3c60d98a7 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java -@@ -25,7 +25,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre +@@ -25,7 +_,7 @@ private volatile boolean stopping; private WatchdogThread(long timeoutTime, boolean restart) { @@ -17,7 +9,7 @@ index 5c1306ac6eb620a38ed5ef3632b611214e1d5dcd..048b96047ac737cf515682593d4632b3 this.timeoutTime = timeoutTime; this.restart = restart; this.earlyWarningEvery = Math.min(GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); -@@ -75,14 +75,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre +@@ -75,14 +_,14 @@ this.lastEarlyWarning = currentTime; if (isLongTimeout) { logger.log(Level.SEVERE, "------------------------------"); @@ -35,7 +27,7 @@ index 5c1306ac6eb620a38ed5ef3632b611214e1d5dcd..048b96047ac737cf515682593d4632b3 if (net.minecraft.world.level.Level.lastPhysicsProblem != null) { logger.log(Level.SEVERE, "------------------------------"); -@@ -102,12 +102,12 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre +@@ -102,12 +_,12 @@ } // Paper end } else { @@ -50,7 +42,7 @@ index 5c1306ac6eb620a38ed5ef3632b611214e1d5dcd..048b96047ac737cf515682593d4632b3 FeatureHooks.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - log detailed tick information WatchdogThread.dumpThread(ManagementFactory.getThreadMXBean().getThreadInfo(MinecraftServer.getServer().serverThread.threadId(), Integer.MAX_VALUE), logger); logger.log(Level.SEVERE, "------------------------------"); -@@ -120,7 +120,7 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre +@@ -120,7 +_,7 @@ WatchdogThread.dumpThread(thread, logger); } } else { diff --git a/purpur-server/paper-patches/unapplied-files/src/main/resources/log4j2.xml.patch b/purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch similarity index 74% rename from purpur-server/paper-patches/unapplied-files/src/main/resources/log4j2.xml.patch rename to purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch index d9853d97b..8b4a31032 100644 --- a/purpur-server/paper-patches/unapplied-files/src/main/resources/log4j2.xml.patch +++ b/purpur-server/paper-patches/files/src/main/resources/log4j2.xml.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 4d881018248133d51661b45a087ebafdca62be8f..7441a667831a2f26c73bd03754846a9fd2a3353a 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml -@@ -2,7 +2,16 @@ +@@ -2,7 +_,16 @@ diff --git a/purpur-server/paper-patches/unapplied-files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch b/purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch similarity index 73% rename from purpur-server/paper-patches/unapplied-files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch rename to purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch index 153f5d136..6fb471079 100644 --- a/purpur-server/paper-patches/unapplied-files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch +++ b/purpur-server/paper-patches/files/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java.patch @@ -1,14 +1,6 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java -index b9ce8c1a98ea847850809fea72a369bd8e7f249e..1ae700532dad07a39a3b973d7c077f308c3301ee 100644 --- a/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java +++ b/src/test/java/io/papermc/paper/permissions/MinecraftCommandPermissionsTest.java -@@ -46,6 +46,7 @@ public class MinecraftCommandPermissionsTest { +@@ -46,6 +_,7 @@ Set foundPerms = new HashSet<>(); for (CommandNode child : root.getChildren()) { final String vanillaPerm = VanillaCommandWrapper.getPermission(child); @@ -16,7 +8,7 @@ index b9ce8c1a98ea847850809fea72a369bd8e7f249e..1ae700532dad07a39a3b973d7c077f30 if (!perms.contains(vanillaPerm)) { missing.add("Missing permission for " + child.getName() + " (" + vanillaPerm + ") command"); } else { -@@ -58,6 +59,25 @@ public class MinecraftCommandPermissionsTest { +@@ -58,6 +_,25 @@ } private static final List TO_SKIP = List.of( diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch deleted file mode 100644 index 039365890..000000000 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 5a4e9853103153b31456190e3f95dc98642f3ec5..e24eb67ad0742ac6116e7a5b84998db61dc0fc93 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -@@ -291,6 +291,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { - @Override - public void recalculatePermissions() { - this.perm.recalculatePermissions(); -+ getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur - Add portal permission bypass - } - - @Override diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch deleted file mode 100644 index 5df71deb2..000000000 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -index 22704813d84f5ff44ef8d8b1baaa95ae4fc73b05..456f31b0a0663f0784b7c8b2b1a3995531e0f970 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java -@@ -243,4 +243,11 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { - public void restock() { - getHandle().restock(); - } -+ -+ // Purpur start - Lobotomize stuck villagers -+ @Override -+ public boolean isLobotomized() { -+ return getHandle().isLobotomized(); -+ } -+ // Purpur end - Lobotomize stuck villagers - } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch deleted file mode 100644 index 796b11efb..000000000 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java -index a573499fb96cb08d96e0b20602fc423bfd0e2f52..eb9cbc29181ffc83acd556f26f2c0b4f227808ab 100644 ---- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java -+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java -@@ -46,4 +46,10 @@ public class CraftMapRenderer extends MapRenderer { - } - } - -+ // Purpur start - Explorer Map API -+ @Override -+ public boolean isExplorerMap() { -+ return this.worldMap.isExplorerMap; -+ } -+ // Purpur end - Explorer Map API - } diff --git a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch deleted file mode 100644 index 50730f0be..000000000 --- a/purpur-server/paper-patches/unapplied-files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 641e5706903b49be5e7541af8d07dd1dea4ba4e4 Mon Sep 17 00:00:00 2001 -From: File -Date: Sun, 20 Apr 1997 05:37:42 -0800 -Subject: [PATCH] purpur paperServer File Patches - - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 9323383f7d1226d887fc9219354ac9613204cbc2..89d8e918f5e0242c7aa10b3e78382130a4631d00 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -485,7 +485,7 @@ public final class CraftMagicNumbers implements UnsafeValues { - - @Override - public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { -- return new com.destroystokyo.paper.PaperVersionFetcher(); -+ return new org.purpurmc.purpur.PurpurVersionFetcher(); // Purpur - use old Paper version checker - } - - @Override