diff --git a/patches/api/0005-Ridables.patch b/patches/api/0005-Ridables.patch index 26f8ecd57..2c27f5766 100644 --- a/patches/api/0005-Ridables.patch +++ b/patches/api/0005-Ridables.patch @@ -20,11 +20,11 @@ index 2405254739a83b2fb517da7fa4ea0721c68f9f6d..825c02793e3aaff45a8a0a9da01d72da /** * @deprecated removed in 1.16 */ -diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableMoveEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/entity/RidableMoveEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/RidableMoveEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..48e7ac392fe5efac8a4ce549e31a05ed817417e4 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/entity/RidableMoveEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/entity/RidableMoveEvent.java @@ -0,0 +1,103 @@ +package net.pl3x.purpur.event.entity; + @@ -129,11 +129,11 @@ index 0000000000000000000000000000000000000000..48e7ac392fe5efac8a4ce549e31a05ed + return handlers; + } +} -diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/RidableSpacebarEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503d2550f77 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/entity/RidableSpacebarEvent.java @@ -0,0 +1,37 @@ +package net.pl3x.purpur.event.entity; + diff --git a/patches/api/0007-Llama-API.patch b/patches/api/0007-Llama-API.patch index 8b336a47a..500d25cac 100644 --- a/patches/api/0007-Llama-API.patch +++ b/patches/api/0007-Llama-API.patch @@ -4,11 +4,11 @@ Date: Fri, 18 Oct 2019 22:50:05 -0500 Subject: [PATCH] Llama API -diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..6e68c1399bf30eeef6ce0385867f0cf258698eae --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/entity/LlamaJoinCaravanEvent.java @@ -0,0 +1,61 @@ +package net.pl3x.purpur.event.entity; + @@ -71,11 +71,11 @@ index 0000000000000000000000000000000000000000..6e68c1399bf30eeef6ce0385867f0cf2 + return handlers; + } +} -diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..ec8d978c22835e2789ebaaeddf0d13588ed1122a --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/entity/LlamaLeaveCaravanEvent.java @@ -0,0 +1,34 @@ +package net.pl3x.purpur.event.entity; + diff --git a/patches/api/0008-AFK-API.patch b/patches/api/0008-AFK-API.patch index ee6dd36d5..3ac2b8ed9 100644 --- a/patches/api/0008-AFK-API.patch +++ b/patches/api/0008-AFK-API.patch @@ -4,11 +4,11 @@ Date: Sat, 10 Aug 2019 22:19:56 -0500 Subject: [PATCH] AFK API -diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/PlayerAFKEvent.java b/src/main/java/org/purpurmc/purpur/event/PlayerAFKEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862bd9fc4be --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/PlayerAFKEvent.java @@ -0,0 +1,70 @@ +package net.pl3x.purpur.event; + diff --git a/patches/api/0010-ExecuteCommandEvent.patch b/patches/api/0010-ExecuteCommandEvent.patch index c5928a432..e8c8cc8ad 100644 --- a/patches/api/0010-ExecuteCommandEvent.patch +++ b/patches/api/0010-ExecuteCommandEvent.patch @@ -4,11 +4,11 @@ Date: Fri, 31 May 2019 00:08:28 -0500 Subject: [PATCH] ExecuteCommandEvent -diff --git a/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/ExecuteCommandEvent.java b/src/main/java/org/purpurmc/purpur/event/ExecuteCommandEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..3250bd4dc29a0cf79b08833d95a3321d1a6733f6 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/ExecuteCommandEvent.java @@ -0,0 +1,130 @@ +package net.pl3x.purpur.event; + diff --git a/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch index 51843969f..99ac65d7d 100644 --- a/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch +++ b/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch @@ -4,11 +4,11 @@ Date: Fri, 5 Jul 2019 18:21:15 -0500 Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent -diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/org/purpurmc/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..c050b75e9a11ac728868fe95e3f89e6b99de6ad2 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java @@ -0,0 +1,85 @@ +package net.pl3x.purpur.event; + diff --git a/patches/api/0014-EMC-MonsterEggSpawnEvent.patch b/patches/api/0014-EMC-MonsterEggSpawnEvent.patch index 74209f308..7a501fa0c 100644 --- a/patches/api/0014-EMC-MonsterEggSpawnEvent.patch +++ b/patches/api/0014-EMC-MonsterEggSpawnEvent.patch @@ -4,11 +4,11 @@ Date: Mon, 21 Nov 2016 17:02:11 -0500 Subject: [PATCH] EMC - MonsterEggSpawnEvent -diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..8f1c9c421aeeb0ddf331f076a9b646c510ea4337 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/entity/MonsterEggSpawnEvent.java @@ -0,0 +1,67 @@ +package net.pl3x.purpur.event.entity; + diff --git a/patches/api/0016-Anvil-API.patch b/patches/api/0016-Anvil-API.patch index f660b4e76..33843a392 100644 --- a/patches/api/0016-Anvil-API.patch +++ b/patches/api/0016-Anvil-API.patch @@ -4,11 +4,11 @@ Date: Sun, 19 Apr 2020 00:25:09 -0500 Subject: [PATCH] Anvil API -diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/org/purpurmc/purpur/event/inventory/AnvilTakeResultEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..85663c0a44695f7b7f01a68693cac3d99f4b56ca --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/inventory/AnvilTakeResultEvent.java @@ -0,0 +1,52 @@ +package net.pl3x.purpur.event.inventory; + @@ -62,11 +62,11 @@ index 0000000000000000000000000000000000000000..85663c0a44695f7b7f01a68693cac3d9 + return handlers; + } +} -diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/org/purpurmc/purpur/event/inventory/AnvilUpdateResultEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..2717ad82ccc0d39c5a69b8890303c245e9a17f83 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/inventory/AnvilUpdateResultEvent.java @@ -0,0 +1,35 @@ +package net.pl3x.purpur.event.inventory; + diff --git a/patches/api/0028-PlayerBookTooLargeEvent.patch b/patches/api/0028-PlayerBookTooLargeEvent.patch index 3fe0eab33..9c9cc787e 100644 --- a/patches/api/0028-PlayerBookTooLargeEvent.patch +++ b/patches/api/0028-PlayerBookTooLargeEvent.patch @@ -4,11 +4,11 @@ Date: Wed, 23 Dec 2020 00:43:27 -0600 Subject: [PATCH] PlayerBookTooLargeEvent -diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerBookTooLargeEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerBookTooLargeEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/player/PlayerBookTooLargeEvent.java b/src/main/java/org/purpurmc/purpur/event/player/PlayerBookTooLargeEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..39378ee2bfadf42ff358cc7b42dd75ac61615e15 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/player/PlayerBookTooLargeEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/player/PlayerBookTooLargeEvent.java @@ -0,0 +1,65 @@ +package net.pl3x.purpur.event.player; + diff --git a/patches/api/0030-Add-EntityTeleportHinderedEvent.patch b/patches/api/0030-Add-EntityTeleportHinderedEvent.patch index 587b3f0e8..428b3b762 100644 --- a/patches/api/0030-Add-EntityTeleportHinderedEvent.patch +++ b/patches/api/0030-Add-EntityTeleportHinderedEvent.patch @@ -16,11 +16,11 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . -diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityTeleportHinderedEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityTeleportHinderedEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/entity/EntityTeleportHinderedEvent.java b/src/main/java/org/purpurmc/purpur/event/entity/EntityTeleportHinderedEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..e6fcc4027cb70061b804460b39e00cca273d35ad --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/entity/EntityTeleportHinderedEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/entity/EntityTeleportHinderedEvent.java @@ -0,0 +1,117 @@ +package net.pl3x.purpur.event.entity; + diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index f76d8058d..4c0d78bc7 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -105,11 +105,11 @@ index c2220d5157d3065a256cd17410760c6aedf24987..476c60176f10ad656c6c0676f8d43f7a this.generator = gen; this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..f589e4376f88c7774a7fe999cad4d11a59379cd9 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -0,0 +1,159 @@ +package net.pl3x.purpur; + @@ -270,11 +270,11 @@ index 0000000000000000000000000000000000000000..f589e4376f88c7774a7fe999cad4d11a + return builder.build(); + } +} -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..8bc89d48695c816a1db77f9cdffd05f35afea92a --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -0,0 +1,96 @@ +package net.pl3x.purpur; + @@ -372,11 +372,11 @@ index 0000000000000000000000000000000000000000..8bc89d48695c816a1db77f9cdffd05f3 + return value.isEmpty() ? fallback : value; + } +} -diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java b/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338fb8ae628e --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java @@ -0,0 +1,65 @@ +package net.pl3x.purpur.command; + diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index ee3b69cfb..99de3ab90 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -4514,10 +4514,10 @@ index 15744949537430d8d8ae71ea72481126c9aff7bd..36417466ae30e9f7f3e953fd4ff98ed3 // CraftBukkit end Projectile(EntityType type, Level world) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index f589e4376f88c7774a7fe999cad4d11a59379cd9..f5cdf3338411650add4a2eb41e0412182b1f6fdf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -156,4 +156,9 @@ public class PurpurConfig { } return builder.build(); @@ -4528,10 +4528,10 @@ index f589e4376f88c7774a7fe999cad4d11a59379cd9..f5cdf3338411650add4a2eb41e041218 + cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob); + } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8bc89d48695c816a1db77f9cdffd05f35afea92a..defc41f65e0899c2ae0984b55aeebcb8f606f040 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -93,4 +93,532 @@ public class PurpurWorldConfig { final Map value = PurpurConfig.getMap("world-settings." + worldName + "." + path, null); return value.isEmpty() ? fallback : value; @@ -5065,11 +5065,11 @@ index 8bc89d48695c816a1db77f9cdffd05f35afea92a..defc41f65e0899c2ae0984b55aeebcb8 + zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); + } } -diff --git a/src/main/java/net/pl3x/purpur/controller/FlyingMoveControllerWASD.java b/src/main/java/net/pl3x/purpur/controller/FlyingMoveControllerWASD.java +diff --git a/src/main/java/org/purpurmc/purpur/controller/FlyingMoveControllerWASD.java b/src/main/java/org/purpurmc/purpur/controller/FlyingMoveControllerWASD.java new file mode 100644 index 0000000000000000000000000000000000000000..d0f6c7d47d158b49fb6a5fe2a7480ffd53f844c5 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/controller/FlyingMoveControllerWASD.java ++++ b/src/main/java/org/purpurmc/purpur/controller/FlyingMoveControllerWASD.java @@ -0,0 +1,61 @@ +package net.pl3x.purpur.controller; + @@ -5132,11 +5132,11 @@ index 0000000000000000000000000000000000000000..d0f6c7d47d158b49fb6a5fe2a7480ffd + setStrafe(entity.getStrafeMot()); + } +} -diff --git a/src/main/java/net/pl3x/purpur/controller/FlyingWithSpacebarMoveControllerWASD.java b/src/main/java/net/pl3x/purpur/controller/FlyingWithSpacebarMoveControllerWASD.java +diff --git a/src/main/java/org/purpurmc/purpur/controller/FlyingWithSpacebarMoveControllerWASD.java b/src/main/java/org/purpurmc/purpur/controller/FlyingWithSpacebarMoveControllerWASD.java new file mode 100644 index 0000000000000000000000000000000000000000..79d23cb66bc825fe78ecc249f12ef8b9851e09f8 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/controller/FlyingWithSpacebarMoveControllerWASD.java ++++ b/src/main/java/org/purpurmc/purpur/controller/FlyingWithSpacebarMoveControllerWASD.java @@ -0,0 +1,61 @@ +package net.pl3x.purpur.controller; + @@ -5199,11 +5199,11 @@ index 0000000000000000000000000000000000000000..79d23cb66bc825fe78ecc249f12ef8b9 + } + } +} -diff --git a/src/main/java/net/pl3x/purpur/controller/LookControllerWASD.java b/src/main/java/net/pl3x/purpur/controller/LookControllerWASD.java +diff --git a/src/main/java/org/purpurmc/purpur/controller/LookControllerWASD.java b/src/main/java/org/purpurmc/purpur/controller/LookControllerWASD.java new file mode 100644 index 0000000000000000000000000000000000000000..b93fe26c357930d5c0242da8137443feb216f9dd --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/controller/LookControllerWASD.java ++++ b/src/main/java/org/purpurmc/purpur/controller/LookControllerWASD.java @@ -0,0 +1,76 @@ +package net.pl3x.purpur.controller; + @@ -5281,11 +5281,11 @@ index 0000000000000000000000000000000000000000..b93fe26c357930d5c0242da8137443fe + return pitch; + } +} -diff --git a/src/main/java/net/pl3x/purpur/controller/MoveControllerWASD.java b/src/main/java/net/pl3x/purpur/controller/MoveControllerWASD.java +diff --git a/src/main/java/org/purpurmc/purpur/controller/MoveControllerWASD.java b/src/main/java/org/purpurmc/purpur/controller/MoveControllerWASD.java new file mode 100644 index 0000000000000000000000000000000000000000..4a3a1eca04a58682d5aeb720832bad5cc8ba2d9c --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/controller/MoveControllerWASD.java ++++ b/src/main/java/org/purpurmc/purpur/controller/MoveControllerWASD.java @@ -0,0 +1,89 @@ +package net.pl3x.purpur.controller; + @@ -5376,11 +5376,11 @@ index 0000000000000000000000000000000000000000..4a3a1eca04a58682d5aeb720832bad5c + } + } +} -diff --git a/src/main/java/net/pl3x/purpur/controller/WaterMoveControllerWASD.java b/src/main/java/net/pl3x/purpur/controller/WaterMoveControllerWASD.java +diff --git a/src/main/java/org/purpurmc/purpur/controller/WaterMoveControllerWASD.java b/src/main/java/org/purpurmc/purpur/controller/WaterMoveControllerWASD.java new file mode 100644 index 0000000000000000000000000000000000000000..c9b24eeaa4221c56dc5030ad4574499e1a03727d --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/controller/WaterMoveControllerWASD.java ++++ b/src/main/java/org/purpurmc/purpur/controller/WaterMoveControllerWASD.java @@ -0,0 +1,50 @@ +package net.pl3x.purpur.controller; + @@ -5432,11 +5432,11 @@ index 0000000000000000000000000000000000000000..c9b24eeaa4221c56dc5030ad4574499e + setStrafe(entity.getStrafeMot()); + } +} -diff --git a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java new file mode 100644 index 0000000000000000000000000000000000000000..fda24d4ecff91cc28d2a7a45fbb55ea734261153 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java ++++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java @@ -0,0 +1,99 @@ +package net.pl3x.purpur.entity; + @@ -5537,11 +5537,11 @@ index 0000000000000000000000000000000000000000..fda24d4ecff91cc28d2a7a45fbb55ea7 + this.discard(); + } +} -diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java new file mode 100644 index 0000000000000000000000000000000000000000..b196bee2ea6e67897b367d2be1800f16a89a6167 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java ++++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java @@ -0,0 +1,114 @@ +package net.pl3x.purpur.entity; + @@ -5657,11 +5657,11 @@ index 0000000000000000000000000000000000000000..b196bee2ea6e67897b367d2be1800f16 + this.discard(); + } +} -diff --git a/src/main/java/net/pl3x/purpur/entity/ai/HasRider.java b/src/main/java/net/pl3x/purpur/entity/ai/HasRider.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/ai/HasRider.java b/src/main/java/org/purpurmc/purpur/entity/ai/HasRider.java new file mode 100644 index 0000000000000000000000000000000000000000..bd48d16bbe3d9b10541a5e65c037926b3a58af22 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/entity/ai/HasRider.java ++++ b/src/main/java/org/purpurmc/purpur/entity/ai/HasRider.java @@ -0,0 +1,20 @@ +package net.pl3x.purpur.entity.ai; + @@ -5683,11 +5683,11 @@ index 0000000000000000000000000000000000000000..bd48d16bbe3d9b10541a5e65c037926b + return entity.getRider() != null; + } +} -diff --git a/src/main/java/net/pl3x/purpur/entity/ai/HorseHasRider.java b/src/main/java/net/pl3x/purpur/entity/ai/HorseHasRider.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/ai/HorseHasRider.java b/src/main/java/org/purpurmc/purpur/entity/ai/HorseHasRider.java new file mode 100644 index 0000000000000000000000000000000000000000..8eefb7b7eb33aecf48ac206d3f0139e0cf342e35 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/entity/ai/HorseHasRider.java ++++ b/src/main/java/org/purpurmc/purpur/entity/ai/HorseHasRider.java @@ -0,0 +1,17 @@ +package net.pl3x.purpur.entity.ai; + diff --git a/patches/server/0007-Configurable-entity-base-attributes.patch b/patches/server/0007-Configurable-entity-base-attributes.patch index 692c424ee..f61794c98 100644 --- a/patches/server/0007-Configurable-entity-base-attributes.patch +++ b/patches/server/0007-Configurable-entity-base-attributes.patch @@ -1421,10 +1421,10 @@ index ab648e7dafd78f414646cef96b422e87da5c1982..0bcfece84ac11f04671ed38a99b31da9 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index defc41f65e0899c2ae0984b55aeebcb8f606f040..20215510857b8e49ea0c93d35eddfbad7cd355b0 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -104,257 +104,573 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0008-Timings-stuff.patch b/patches/server/0008-Timings-stuff.patch index d4ee458e7..57d01f68c 100644 --- a/patches/server/0008-Timings-stuff.patch +++ b/patches/server/0008-Timings-stuff.patch @@ -58,10 +58,10 @@ index cdf0f5cafd39a874ea09fdb35b237e3c59c226d9..8087c4d63f1d5768dd786a152eca5d00 if (!TimingsManager.url.endsWith("/")) { TimingsManager.url += "/"; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index f5cdf3338411650add4a2eb41e0412182b1f6fdf..8747593597ed270400ef3d3f6b141a0fb370f1b4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -161,4 +161,17 @@ public class PurpurConfig { private static void messages() { cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob); diff --git a/patches/server/0009-Barrels-and-enderchests-6-rows.patch b/patches/server/0009-Barrels-and-enderchests-6-rows.patch index b759aeb89..f1d714bc4 100644 --- a/patches/server/0009-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0009-Barrels-and-enderchests-6-rows.patch @@ -169,10 +169,10 @@ index 5a47d58071b83ea911e4cb5e1cc5468801ad0d55..45e3b3bbfc5f188d7339550e3ce4b835 } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 8747593597ed270400ef3d3f6b141a0fb370f1b4..eaff201b75f74a41e14c43d522d7b87faf9296b3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -174,4 +174,39 @@ public class PurpurConfig { } if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip"); diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch index 037c14143..5402aa7b5 100644 --- a/patches/server/0011-AFK-API.patch +++ b/patches/server/0011-AFK-API.patch @@ -212,10 +212,10 @@ index 30276959c0119813c27ee3f98e237c93236e5b39..385cccecdddde4abd5c6525aa6404eb2 double d = player.distanceToSqr(x, y, z); if (range < 0.0D || d < range * range) { return true; -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index eaff201b75f74a41e14c43d522d7b87faf9296b3..7f572658706fdc3009490bd54c2393f7685c7de7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -158,8 +158,16 @@ public class PurpurConfig { } @@ -233,10 +233,10 @@ index eaff201b75f74a41e14c43d522d7b87faf9296b3..7f572658706fdc3009490bd54c2393f7 } private static void timingsSettings() { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf53c815e97 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,6 +94,24 @@ public class PurpurWorldConfig { return value.isEmpty() ? fallback : value; } diff --git a/patches/server/0013-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch index 6996b3025..b039038a1 100644 --- a/patches/server/0013-Configurable-server-mod-name.patch +++ b/patches/server/0013-Configurable-server-mod-name.patch @@ -17,10 +17,10 @@ index 5072cb76e0793ee6c47800628daa65906bde8577..e140e58b9444573089cda145c7957a2d } public SystemReport fillSystemReport(SystemReport details) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 7f572658706fdc3009490bd54c2393f7685c7de7..bc5f937e7480d954680c7b9f1d698aff3e28665d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -170,6 +170,11 @@ public class PurpurConfig { afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix); } diff --git a/patches/server/0015-Lagging-threshold.patch b/patches/server/0015-Lagging-threshold.patch index b47bb7992..351fa13b4 100644 --- a/patches/server/0015-Lagging-threshold.patch +++ b/patches/server/0015-Lagging-threshold.patch @@ -24,10 +24,10 @@ index b5a307f00f92a640b13c60f6ebee204223c0d9e2..0471827e17e93f3e579290a0100d3236 tickSection = curTime; } // Spigot end -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index bc5f937e7480d954680c7b9f1d698aff3e28665d..c0e7027ad804d7b801ef8cb94963c113c95735d1 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -188,6 +188,11 @@ public class PurpurConfig { if (!co.aikar.timings.TimingsManager.hiddenConfigs.contains("server-ip")) co.aikar.timings.TimingsManager.hiddenConfigs.add("server-ip"); } diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 9edc74895..ec899b5e3 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -120,10 +120,10 @@ index 48e78e76d23cc6aff00a1526d53581deebec4c1d..fe1ad78a41d01feaf64b64d0b8585e23 // CraftBukkit end return entityplayer1; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce5ccf7b0c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -99,6 +99,8 @@ public class PurpurWorldConfig { public boolean idleTimeoutCountAsSleeping = false; public boolean idleTimeoutUpdateTabList = false; diff --git a/patches/server/0020-Configurable-villager-brain-ticks.patch b/patches/server/0020-Configurable-villager-brain-ticks.patch index 71a004e0a..df4f25464 100644 --- a/patches/server/0020-Configurable-villager-brain-ticks.patch +++ b/patches/server/0020-Configurable-villager-brain-ticks.patch @@ -35,10 +35,10 @@ index 0a2131d7455d7de7c9a3f9d50710da870062e714..4c20685b3d8735272f9f97a75485a643 if (!inactive) this.getBrain().tick((ServerLevel) this.level, this); // Paper this.level.getProfiler().pop(); if (this.assignProfessionWhenSpawned) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8e9ba3a8582c8e5d1e14bf3bfa8ecfce5ccf7b0c..6df320ab8214669517d5de30a28f044a5a6b4a33 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1077,6 +1077,8 @@ public class PurpurWorldConfig { public boolean villagerRidable = false; public boolean villagerRidableInWater = false; diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0021-Alternative-Keepalive-Handling.patch index afad9cded..eba7a208b 100644 --- a/patches/server/0021-Alternative-Keepalive-Handling.patch +++ b/patches/server/0021-Alternative-Keepalive-Handling.patch @@ -55,10 +55,10 @@ index 621f0f75096c89bd050f7e0ede8abcb15536ce70..bb0f8dbc0746283ff7670dee24dd9322 //PlayerConnectionUtils.ensureMainThread(packetplayinkeepalive, this, this.player.getWorldServer()); // CraftBukkit // Paper - This shouldn't be on the main thread if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) { int i = (int) (Util.getMillis() - this.keepAliveTime); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index c0e7027ad804d7b801ef8cb94963c113c95735d1..4b6bb477db0af506508e73dd42155429777b49d0 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -193,6 +193,11 @@ public class PurpurConfig { laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold); } diff --git a/patches/server/0022-Silk-touch-spawners.patch b/patches/server/0022-Silk-touch-spawners.patch index 9f6acf8ab..fcf476bcf 100644 --- a/patches/server/0022-Silk-touch-spawners.patch +++ b/patches/server/0022-Silk-touch-spawners.patch @@ -138,10 +138,10 @@ index 130ffb06b12565efb35afb55b6da20b1b16f6f06..bc4646a7a72c33a3671115953a2bbd7c int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15); // this.popExperience(worldserver, blockposition, i); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 6df320ab8214669517d5de30a28f044a5a6b4a33..8920b47610a323ceb6b19a05b7592d8acf809bc4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -116,6 +116,38 @@ public class PurpurWorldConfig { playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack); } @@ -181,11 +181,11 @@ index 6df320ab8214669517d5de30a28f044a5a6b4a33..8920b47610a323ceb6b19a05b7592d8a public boolean babiesAreRidable = true; public boolean untamedTamablesAreRidable = true; public boolean useNightVisionWhenRiding = false; -diff --git a/src/main/java/net/pl3x/purpur/item/SpawnerItem.java b/src/main/java/net/pl3x/purpur/item/SpawnerItem.java +diff --git a/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java b/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java new file mode 100644 index 0000000000000000000000000000000000000000..728da3d75ec957ee789f9625483565e38649acd5 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/item/SpawnerItem.java ++++ b/src/main/java/org/purpurmc/purpur/item/SpawnerItem.java @@ -0,0 +1,36 @@ +package net.pl3x.purpur.item; + diff --git a/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch index 917b7e71a..739d00eb5 100644 --- a/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -49,10 +49,10 @@ index 8033d2074d68635515b4737b4416ec9354a3edad..b942e7c85e6c8f9a7664d9e5bf93bcd7 + // Purpur end } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8920b47610a323ceb6b19a05b7592d8acf809bc4..5b82c82da88f95190f8d7dc1f635fd27c8b513df 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1079,7 +1079,10 @@ public class PurpurWorldConfig { public boolean turtleRidable = false; public boolean turtleRidableInWater = false; diff --git a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch index 324869755..42a9db785 100644 --- a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch @@ -28,10 +28,10 @@ index ecdac349efbea9e05ac66200c5d0f0385ad1349b..749f3cda15d1f9a0b0c73fa9eda9e58f ServerRecipeBook.LOGGER.error("Tried to load unrecognized recipe: {} removed now.", minecraftkey); } else { handler.accept((Recipe) optional.get()); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 4b6bb477db0af506508e73dd42155429777b49d0..7f08a6a0e92300825ca90aeb55379a07474b76e5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -232,4 +232,13 @@ public class PurpurConfig { org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27); enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); diff --git a/patches/server/0027-Giants-AI-settings.patch b/patches/server/0027-Giants-AI-settings.patch index 44a7273ad..82431a831 100644 --- a/patches/server/0027-Giants-AI-settings.patch +++ b/patches/server/0027-Giants-AI-settings.patch @@ -119,10 +119,10 @@ index a8ffdc8810152d77668aad7bad15a00c4d194d4c..91e28c414545d2bbb4e2f22c516d0f68 + return super.getWalkTargetValue(pos, world); // Purpur - fix light requirements for natural spawns } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 5b82c82da88f95190f8d7dc1f635fd27c8b513df..01c33f5021905736b05fc33c268e42e4e82c2863 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -468,6 +468,10 @@ public class PurpurWorldConfig { public double giantMovementSpeed = 0.5D; public double giantAttackDamage = 50.0D; diff --git a/patches/server/0028-Zombie-horse-naturally-spawn.patch b/patches/server/0028-Zombie-horse-naturally-spawn.patch index 84dca6f80..6b94a1106 100644 --- a/patches/server/0028-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0028-Zombie-horse-naturally-spawn.patch @@ -27,10 +27,10 @@ index 338fa80f3fde1918b8ccf23c017d386719d7ead8..963c249f2bcf2a264c9e4cd0961f11bb entityhorseskeleton.setAge(0); entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()); this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 01c33f5021905736b05fc33c268e42e4e82c2863..9db45abd1963ae7f48fe06f29fc4e3bf9e2cd983 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1266,6 +1266,7 @@ public class PurpurWorldConfig { public double zombieHorseJumpStrengthMax = 1.0D; public double zombieHorseMovementSpeedMin = 0.2D; diff --git a/patches/server/0029-Charged-creeper-naturally-spawn.patch b/patches/server/0029-Charged-creeper-naturally-spawn.patch index bd31eed4e..62427450d 100644 --- a/patches/server/0029-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0029-Charged-creeper-naturally-spawn.patch @@ -23,10 +23,10 @@ index b149deea5f9151d5d310e0b933d355e1e77ada1d..a878693fe74f1509b4d3ba5199a7b7f1 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 9db45abd1963ae7f48fe06f29fc4e3bf9e2cd983..17952c0f39deeed6c333289f35705c5ae49e0596 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -290,6 +290,7 @@ public class PurpurWorldConfig { public boolean creeperRidable = false; public boolean creeperRidableInWater = false; diff --git a/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch index 27b9f860d..a46744c77 100644 --- a/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch @@ -37,10 +37,10 @@ index 845931a76d3b94ee9a1c0f238c3ea254950700bc..9ddb39fb7028e91c97039887afeaf711 Biome biomebase = world.getBiome(this.blockPosition()); int i = this.random.nextInt(100); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 17952c0f39deeed6c333289f35705c5ae49e0596..5dbec1b5662df093394e9159fb11e401444da19a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -844,6 +844,8 @@ public class PurpurWorldConfig { public boolean rabbitRidable = false; public boolean rabbitRidableInWater = false; diff --git a/patches/server/0032-Tulips-change-fox-type.patch b/patches/server/0032-Tulips-change-fox-type.patch index b1b1ecb93..afc42be11 100644 --- a/patches/server/0032-Tulips-change-fox-type.patch +++ b/patches/server/0032-Tulips-change-fox-type.patch @@ -74,10 +74,10 @@ index 5665ee66a3b7355a6dc65409afda42ea94449b0b..d334321f3947288861066038eb70b98c @Override // Paper start - Cancellable death event protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 5dbec1b5662df093394e9159fb11e401444da19a..b14853de709d9d083e2c349f398d81f629ebf6eb 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -438,6 +438,7 @@ public class PurpurWorldConfig { public boolean foxRidable = false; public boolean foxRidableInWater = false; diff --git a/patches/server/0033-Breedable-Polar-Bears.patch b/patches/server/0033-Breedable-Polar-Bears.patch index e718a3a29..e4cf23063 100644 --- a/patches/server/0033-Breedable-Polar-Bears.patch +++ b/patches/server/0033-Breedable-Polar-Bears.patch @@ -58,10 +58,10 @@ index 36f6d2b2f074eb49187a2d0badbf2bedde8a6935..5dc981130464027f9af02f1d10ec8044 this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D)); this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D)); this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b14853de709d9d083e2c349f398d81f629ebf6eb..241ba6a10eda5bf97adb09cc2ae423da6036d55f 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -820,6 +820,8 @@ public class PurpurWorldConfig { public boolean polarBearRidable = false; public boolean polarBearRidableInWater = false; diff --git a/patches/server/0034-Chickens-can-retaliate.patch b/patches/server/0034-Chickens-can-retaliate.patch index b9fb1cf0e..3984f4b45 100644 --- a/patches/server/0034-Chickens-can-retaliate.patch +++ b/patches/server/0034-Chickens-can-retaliate.patch @@ -50,10 +50,10 @@ index e549add41f986f9eab68f148865a4170f732c814..7fd330c77159dc21d5170b386d27128f } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 241ba6a10eda5bf97adb09cc2ae423da6036d55f..8692ca2751ba6ed6ad989843261b13d2eeba669e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -250,6 +250,7 @@ public class PurpurWorldConfig { public boolean chickenRidable = false; public boolean chickenRidableInWater = false; diff --git a/patches/server/0035-Add-option-to-set-armorstand-step-height.patch b/patches/server/0035-Add-option-to-set-armorstand-step-height.patch index f541a520a..593b38c5d 100644 --- a/patches/server/0035-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0035-Add-option-to-set-armorstand-step-height.patch @@ -16,10 +16,10 @@ index e5ef24d92de21c4c0e6a98e06985e52d47bfdce0..dc1630a1a769f848059f576c3d1220a2 // Paper start if (!this.canTick) { if (this.noTickPoseDirty) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8692ca2751ba6ed6ad989843261b13d2eeba669e..7eead3ef93dd4e8d912809a2c47062b95cb80168 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,6 +94,11 @@ public class PurpurWorldConfig { return value.isEmpty() ? fallback : value; } diff --git a/patches/server/0036-Cat-spawning-options.patch b/patches/server/0036-Cat-spawning-options.patch index 14ce8b521..14ea61e91 100644 --- a/patches/server/0036-Cat-spawning-options.patch +++ b/patches/server/0036-Cat-spawning-options.patch @@ -48,10 +48,10 @@ index 436f9cb45ff5b83f55b12f291bed355fa12a0655..0784f6a0aa39c8e49b009f53d91432ff return list.size() < 1 ? this.spawnCat(pos, world) : 0; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7eead3ef93dd4e8d912809a2c47062b95cb80168..8f7e7007633ee30f3f943d583623c122d5bc7de3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -227,6 +227,9 @@ public class PurpurWorldConfig { public boolean catRidable = false; public boolean catRidableInWater = false; diff --git a/patches/server/0038-Cows-eat-mushrooms.patch b/patches/server/0038-Cows-eat-mushrooms.patch index fe9ef1430..b5ec909b3 100644 --- a/patches/server/0038-Cows-eat-mushrooms.patch +++ b/patches/server/0038-Cows-eat-mushrooms.patch @@ -113,10 +113,10 @@ index 8b9c7c2292afed5928b262dad4d825473d400880..d2d971f3a135c9bebbda618eb5a0d4a4 @Override public Cow getBreedOffspring(ServerLevel world, AgeableMob entity) { return (Cow) EntityType.COW.create(world); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8f7e7007633ee30f3f943d583623c122d5bc7de3..c5124c7beff61ea1a60db0b0e14f99f3302831b9 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -289,6 +289,7 @@ public class PurpurWorldConfig { public boolean cowRidable = false; public boolean cowRidableInWater = false; diff --git a/patches/server/0040-Pigs-give-saddle-back.patch b/patches/server/0040-Pigs-give-saddle-back.patch index c60e3f738..bdf0e8912 100644 --- a/patches/server/0040-Pigs-give-saddle-back.patch +++ b/patches/server/0040-Pigs-give-saddle-back.patch @@ -27,10 +27,10 @@ index e2d4e9f1955fb40b43e82e4876a39560ab2e23d1..0973fb94748170fbf51d78b3ead657b6 player.startRiding(this); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index c5124c7beff61ea1a60db0b0e14f99f3302831b9..91d62888b6012b51b1eeb29b864d7d560397b7c1 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -779,6 +779,7 @@ public class PurpurWorldConfig { public boolean pigRidable = false; public boolean pigRidableInWater = false; diff --git a/patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch index 57c746a8d..9149a6b8a 100644 --- a/patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch @@ -31,10 +31,10 @@ index 5cbb66da8aacbdcec3c22610708d91af4dd87cd3..dbd005660d70918fe5a9d0f5c74f6b7d this.spawnAtLocation(new ItemStack(Items.CARVED_PUMPKIN), 1.7F); this.forceDrops = false; // CraftBukkit } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 91d62888b6012b51b1eeb29b864d7d560397b7c1..94b7f06779eda71e7e14458d1e1eacc1969e899c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1010,6 +1010,8 @@ public class PurpurWorldConfig { public boolean snowGolemRidableInWater = false; public boolean snowGolemLeaveTrailWhenRidden = false; diff --git a/patches/server/0042-Ender-dragon-always-drop-full-exp.patch b/patches/server/0042-Ender-dragon-always-drop-full-exp.patch index f61c5a129..b3a0b4bcc 100644 --- a/patches/server/0042-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0042-Ender-dragon-always-drop-full-exp.patch @@ -17,10 +17,10 @@ index 89680ef19b511ffbc241279647412f754085db4c..e29fe6939d59a58093ddfbdf9b274469 short0 = 12000; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 94b7f06779eda71e7e14458d1e1eacc1969e899c..12407ab2b99b9d4aa00ddd73f9257d6de493f524 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -392,6 +392,7 @@ public class PurpurWorldConfig { public boolean enderDragonRidableInWater = false; public double enderDragonMaxY = 256D; diff --git a/patches/server/0043-Signs-editable-on-right-click.patch b/patches/server/0043-Signs-editable-on-right-click.patch index 0e059bcf5..66627783c 100644 --- a/patches/server/0043-Signs-editable-on-right-click.patch +++ b/patches/server/0043-Signs-editable-on-right-click.patch @@ -34,10 +34,10 @@ index ed3d78494735ceda14ad0ea23adeadc374f3b35e..a0d23b7e244e7df8a462b801dee18fd4 return signBlockEntity.executeClickCommands((ServerPlayer)player) ? InteractionResult.SUCCESS : InteractionResult.PASS; } else { return InteractionResult.PASS; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 12407ab2b99b9d4aa00ddd73f9257d6de493f524..5cfccc5a7ee50b24151d6886a1f336c6b217c24e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -153,6 +153,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch index 8fd193176..ca7e7b4b1 100644 --- a/patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -17,10 +17,10 @@ index 5d95f3cce8f5190bc2172a1fe0e83166062f0f3d..603e621b16deb63b0d6d7e59e05a8de1 // Paper end - remove abstract block iteration } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 5cfccc5a7ee50b24151d6886a1f336c6b217c24e..2bb17be22ec6a89c8090657cd5093d6a376d5064 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -153,6 +153,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0045-Minecart-settings-and-WASD-controls.patch b/patches/server/0045-Minecart-settings-and-WASD-controls.patch index fe94e0c6b..f266a054e 100644 --- a/patches/server/0045-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0045-Minecart-settings-and-WASD-controls.patch @@ -147,10 +147,10 @@ index ce4848bdd00c091b9eb5fa2d47b03378d43c91b2..2edf760182312a36dc7d0fc7378135a2 public final boolean hasCollision; protected final float explosionResistance; protected final boolean isRandomlyTicking; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2bb17be22ec6a89c8090657cd5093d6a376d5064..b9257b444a9fae83cd42757eec84559185fe4971 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -99,6 +99,68 @@ public class PurpurWorldConfig { armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight); } diff --git a/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch index 2e8749681..eb66a10b2 100644 --- a/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch @@ -19,10 +19,10 @@ index ed11d49f27fdb85f3682b0b79ec4d1fb68ef0466..5ae294293cd9d813e22d251e567d1fc0 } // CraftBukkit start - Call death event org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b9257b444a9fae83cd42757eec84559185fe4971..1533c1a126b4602db25772662d313d5b0b4eab15 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -215,6 +215,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch index 7f2acc386..c965944a2 100644 --- a/patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch @@ -27,10 +27,10 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af } return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 1533c1a126b4602db25772662d313d5b0b4eab15..9a1a942b6f4ad15a6e664f5a774a6aef254eb0d7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -216,8 +216,10 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0052-Configurable-TPS-Catchup.patch b/patches/server/0052-Configurable-TPS-Catchup.patch index 99e580c85..0acf6d83b 100644 --- a/patches/server/0052-Configurable-TPS-Catchup.patch +++ b/patches/server/0052-Configurable-TPS-Catchup.patch @@ -23,10 +23,10 @@ index 0471827e17e93f3e579290a0100d3236d95fe7f1..fd32c276207100c1c52677a109764037 this.waitUntilNextTick(); this.profiler.pop(); this.endMetricsRecordingTick(); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 7f08a6a0e92300825ca90aeb55379a07474b76e5..ae15754986ea4367ccc5853cc10b1c8040bda1fb 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -241,4 +241,9 @@ public class PurpurConfig { loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings); loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors); diff --git a/patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index f72299029..68da36b6a 100644 --- a/patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -17,10 +17,10 @@ index a367f50b0e3fe9e7a1b87892a8c98e88bd678f6f..52d41fb8d0495f61346c718c8f2395bc if (!this.isAcceptibleReturnOwner()) { if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) { this.spawnAtLocation(this.getPickupItem(), 0.1F); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 9a1a942b6f4ad15a6e664f5a774a6aef254eb0d7..df553af2e0a7c9b411a2ba0ed2fd530a537e4bcd 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -217,9 +217,11 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; diff --git a/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch index 935651cd5..126418e53 100644 --- a/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch @@ -37,10 +37,10 @@ index 66ff0e3aa1a7dfb233a459516c4c596c1bbe033e..71b472e3fefe549fe959fda1702213ba return this.enderman.getCarriedBlock() != null ? false : (!this.enderman.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(20)) == 0); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index df553af2e0a7c9b411a2ba0ed2fd530a537e4bcd..ea072b32e1c92424d6e1cee5a92c86e460e11c5d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -387,6 +387,7 @@ public class PurpurWorldConfig { public boolean creeperRidableInWater = false; public double creeperMaxHealth = 20.0D; diff --git a/patches/server/0055-Villagers-follow-emerald-blocks.patch b/patches/server/0055-Villagers-follow-emerald-blocks.patch index 747a9ca38..8d6048b64 100644 --- a/patches/server/0055-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0055-Villagers-follow-emerald-blocks.patch @@ -53,10 +53,10 @@ index 0bcfece84ac11f04671ed38a99b31da9f8b03858..2f0bcf917af26fb7628bda134b650a8b this.goalSelector.addGoal(4, new MoveTowardsRestrictionGoal(this, 0.35D)); this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D)); this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index ea072b32e1c92424d6e1cee5a92c86e460e11c5d..eeb678ce1922d5e8fe8745ffcbfaefd82b93eeaa 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1246,6 +1246,7 @@ public class PurpurWorldConfig { public double villagerMaxHealth = 20.0D; public int villagerBrainTicks = 1; diff --git a/patches/server/0056-Allow-leashing-villagers.patch b/patches/server/0056-Allow-leashing-villagers.patch index 26cbdc73d..9d10cf0fd 100644 --- a/patches/server/0056-Allow-leashing-villagers.patch +++ b/patches/server/0056-Allow-leashing-villagers.patch @@ -48,10 +48,10 @@ index 2f0bcf917af26fb7628bda134b650a8b296091ea..c5dbb1c8210b71f7d9d91089cb139f65 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index eeb678ce1922d5e8fe8745ffcbfaefd82b93eeaa..d14d525a50b154baed229da5269ed491f082dc40 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1247,6 +1247,7 @@ public class PurpurWorldConfig { public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; diff --git a/patches/server/0057-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0057-Implement-configurable-search-radius-for-villagers-t.patch index d0237bd60..2a91a4d08 100644 --- a/patches/server/0057-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0057-Implement-configurable-search-radius-for-villagers-t.patch @@ -17,10 +17,10 @@ index a44a0eaa5f8b1f6dc0b2570fafc5a20c669f07bd..d195212838e253d7a479a89c6650bb00 BlockPos blockposition = this.blockPosition(); for (int i = 0; i < 10; ++i) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index d14d525a50b154baed229da5269ed491f082dc40..f2ea8d40ee8d238c1cd93b600d377e544b9c53e8 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1248,6 +1248,8 @@ public class PurpurWorldConfig { public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; diff --git a/patches/server/0058-Implement-infinite-liquids.patch b/patches/server/0058-Implement-infinite-liquids.patch index d556c01ba..56d598828 100644 --- a/patches/server/0058-Implement-infinite-liquids.patch +++ b/patches/server/0058-Implement-infinite-liquids.patch @@ -80,10 +80,10 @@ index 56d50b9310d30e0f81f3d2549ff5c256eb07cc2a..4cc6d665c7d52b6edcaaa5f9ed131407 // Paper start @Override protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f2ea8d40ee8d238c1cd93b600d377e544b9c53e8..54d72b8b0386443137155fcc0e60c57d38c3e5b3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -229,6 +229,20 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0059-Make-lava-flow-speed-configurable.patch b/patches/server/0059-Make-lava-flow-speed-configurable.patch index 1da271d71..a2d323db1 100644 --- a/patches/server/0059-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0059-Make-lava-flow-speed-configurable.patch @@ -17,10 +17,10 @@ index 9fc7bc3141c0fe6b65d78edf6bac3c45d46ae4fe..a7d2fcad13f1f9b7055732636cd58039 } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 54d72b8b0386443137155fcc0e60c57d38c3e5b3..4d0952bb0f98cdf9482bec98bd22710558bb0181 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -231,9 +231,13 @@ public class PurpurWorldConfig { public boolean lavaInfinite = false; diff --git a/patches/server/0060-Add-player-death-exp-control-options.patch b/patches/server/0060-Add-player-death-exp-control-options.patch index 363adbe0d..776ac3b5a 100644 --- a/patches/server/0060-Add-player-death-exp-control-options.patch +++ b/patches/server/0060-Add-player-death-exp-control-options.patch @@ -30,10 +30,10 @@ index adc094f20ed8bb4c531b06eb2e78bebd3faff578..42becbb21eee4e1b0a14e2fc3e226f0d } else { return 0; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 4d0952bb0f98cdf9482bec98bd22710558bb0181..6f286a16a91b368bdfd98a738be13ec7e468de30 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -168,6 +168,8 @@ public class PurpurWorldConfig { public boolean idleTimeoutTargetPlayer = true; public int playerSpawnInvulnerableTicks = 60; diff --git a/patches/server/0061-Configurable-void-damage-height-and-damage.patch b/patches/server/0061-Configurable-void-damage-height-and-damage.patch index d141b0a36..6abae90a5 100644 --- a/patches/server/0061-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0061-Configurable-void-damage-height-and-damage.patch @@ -30,10 +30,10 @@ index dfbb53ddf9255351b44259d0016b362a3a4625b3..2eea21644321fa07950b44cddfe72c4d } protected void updateSwingTime() { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 6f286a16a91b368bdfd98a738be13ec7e468de30..794c6adf2a4af7fe59b5b1067c1337275b941760 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -222,10 +222,14 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean milkCuresBadOmen = true; diff --git a/patches/server/0062-Add-canSaveToDisk-to-Entity.patch b/patches/server/0062-Add-canSaveToDisk-to-Entity.patch index 5708b7338..b24c51968 100644 --- a/patches/server/0062-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0062-Add-canSaveToDisk-to-Entity.patch @@ -46,10 +46,10 @@ index bc46fdff45b174d9c266d1b6b546061a39b4997d..bc6d523d6d2449b7590ad318e299e770 // Paper start final EntityType entityType = entity.getType(); final int saveLimit = this.level.paperConfig.entityPerChunkSaveLimits.getOrDefault(entityType, -1); -diff --git a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java index fda24d4ecff91cc28d2a7a45fbb55ea734261153..3cabafb00c293cbbcc60a0cc98479c2d62ddaa2d 100644 ---- a/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java -+++ b/src/main/java/net/pl3x/purpur/entity/DolphinSpit.java +--- a/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java ++++ b/src/main/java/org/purpurmc/purpur/entity/DolphinSpit.java @@ -35,6 +35,11 @@ public class DolphinSpit extends LlamaSpit { dolphin.getZ() + (double) (dolphin.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(dolphin.yBodyRot * 0.017453292F)); } @@ -62,10 +62,10 @@ index fda24d4ecff91cc28d2a7a45fbb55ea734261153..3cabafb00c293cbbcc60a0cc98479c2d public void tick() { super_tick(); -diff --git a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java index b196bee2ea6e67897b367d2be1800f16a89a6167..d8a9f3296c46f12e156f1611811cb55470703b03 100644 ---- a/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java -+++ b/src/main/java/net/pl3x/purpur/entity/PhantomFlames.java +--- a/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java ++++ b/src/main/java/org/purpurmc/purpur/entity/PhantomFlames.java @@ -38,6 +38,11 @@ public class PhantomFlames extends LlamaSpit { phantom.getZ() + (double) (phantom.getBbWidth() + 1.0F) * 0.5D * (double) Mth.cos(phantom.yBodyRot * 0.017453292F)); } diff --git a/patches/server/0063-Dispenser-curse-of-binding-protection.patch b/patches/server/0063-Dispenser-curse-of-binding-protection.patch index c56e22036..8b7ed3892 100644 --- a/patches/server/0063-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0063-Dispenser-curse-of-binding-protection.patch @@ -42,10 +42,10 @@ index baa7e055d8ee4a153842128b07984b9f6deac6ca..014dd3aa8a7313d978d4781a1b7c6f53 ItemStack itemstack1 = armor.split(1); // CraftBukkit start Level world = pointer.getLevel(); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 794c6adf2a4af7fe59b5b1067c1337275b941760..0868835769e4d85fbac81fbb0dbd27e6ae5f8020 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -232,6 +232,11 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch index 1b53591b2..1377978d9 100644 --- a/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch @@ -16,10 +16,10 @@ index b967177cb10041f96831322c311579e409050e88..4b38f8186dcd9a98a5413a51c5563c49 return Boat.Status.ON_LAND; } else { return Boat.Status.IN_AIR; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 0868835769e4d85fbac81fbb0dbd27e6ae5f8020..6380c028150c3012f5da45c644cd5f590c00e862 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -219,12 +219,14 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0065-Mending-mends-most-damages-equipment-first.patch b/patches/server/0065-Mending-mends-most-damages-equipment-first.patch index 9a0956e27..2289a8c81 100644 --- a/patches/server/0065-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0065-Mending-mends-most-damages-equipment-first.patch @@ -72,10 +72,10 @@ index 7bc5aa35b52de0027cf58a6127a9903464ccaf47..f3ec99d2eae31ba7ce7d4b8e7399a56d @Deprecated public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, LivingEntity entityliving) { Entry entry = getRandomItemWith(enchantment, entityliving); return entry != null ? entry.getValue() : ItemStack.EMPTY; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 6380c028150c3012f5da45c644cd5f590c00e862..f2807fac5533e995975cf35e014b7fc361576d32 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -219,6 +219,7 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0067-Implement-elytra-settings.patch b/patches/server/0067-Implement-elytra-settings.patch index d0a9da5df..ae4f92631 100644 --- a/patches/server/0067-Implement-elytra-settings.patch +++ b/patches/server/0067-Implement-elytra-settings.patch @@ -98,10 +98,10 @@ index 998758be827efbcb7693ed36ab1dffc0ef0369bf..5beaafec0759543d3bddf99028c97d0d entityhuman.push((double) f2, (double) f3, (double) f4); entityhuman.startAutoSpinAttack(20); if (entityhuman.isOnGround()) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f2807fac5533e995975cf35e014b7fc361576d32..3163d930237291d4a80e5b36e15b4880e3933a4e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -99,6 +99,19 @@ public class PurpurWorldConfig { armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight); } diff --git a/patches/server/0068-Item-entity-immunities.patch b/patches/server/0068-Item-entity-immunities.patch index 1553d4c5a..13314176a 100644 --- a/patches/server/0068-Item-entity-immunities.patch +++ b/patches/server/0068-Item-entity-immunities.patch @@ -95,10 +95,10 @@ index 0ac107d7a360a5812a43488c611498d12546eed9..c2b0add36da8ad1bfb3fbfdd180a8606 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 3163d930237291d4a80e5b36e15b4880e3933a4e..1e0896ed38cf0d861f25d23c6ebe6a0be4742132 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -112,6 +112,49 @@ public class PurpurWorldConfig { elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost); } diff --git a/patches/server/0069-Add-ping-command.patch b/patches/server/0069-Add-ping-command.patch index 6afb3b3a5..d19b7c085 100644 --- a/patches/server/0069-Add-ping-command.patch +++ b/patches/server/0069-Add-ping-command.patch @@ -16,10 +16,10 @@ index 2474594f165aff55d4a08ccf0a602203cc908f65..2778f58a9b506247cbf9abe2b5fe9ab0 } if (environment.includeIntegrated) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index ae15754986ea4367ccc5853cc10b1c8040bda1fb..b1ff36e0e39ff3e44ae7d71bbea10defd0ee4435 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -162,12 +162,14 @@ public class PurpurConfig { public static String afkBroadcastBack = "%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; @@ -35,11 +35,11 @@ index ae15754986ea4367ccc5853cc10b1c8040bda1fb..b1ff36e0e39ff3e44ae7d71bbea10def } public static String serverModName = "Purpur"; -diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/PingCommand.java b/src/main/java/org/purpurmc/purpur/command/PingCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..6de4f71aa5d501f3f5da93cd631da654a6e264e0 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/PingCommand.java @@ -0,0 +1,32 @@ +package net.pl3x.purpur.command; + diff --git a/patches/server/0070-Add-demo-command.patch b/patches/server/0070-Add-demo-command.patch index 010dbc7a2..0f3c63e44 100644 --- a/patches/server/0070-Add-demo-command.patch +++ b/patches/server/0070-Add-demo-command.patch @@ -16,10 +16,10 @@ index 2778f58a9b506247cbf9abe2b5fe9ab0f84502de..eaa24bd6147f161e0a00df91a2375d7f net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index b1ff36e0e39ff3e44ae7d71bbea10defd0ee4435..1e1784d181d07fe4927817dcee71970141b436be 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -162,6 +162,7 @@ public class PurpurConfig { public static String afkBroadcastBack = "%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; @@ -36,11 +36,11 @@ index b1ff36e0e39ff3e44ae7d71bbea10defd0ee4435..1e1784d181d07fe4927817dcee719701 pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); } -diff --git a/src/main/java/net/pl3x/purpur/command/DemoCommand.java b/src/main/java/net/pl3x/purpur/command/DemoCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/DemoCommand.java b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..63686e55d169a81c0c225f8dfb47973075c1e491 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/DemoCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java @@ -0,0 +1,34 @@ +package net.pl3x.purpur.command; + diff --git a/patches/server/0071-Add-credits-command.patch b/patches/server/0071-Add-credits-command.patch index 712f85466..c70ac1e52 100644 --- a/patches/server/0071-Add-credits-command.patch +++ b/patches/server/0071-Add-credits-command.patch @@ -16,10 +16,10 @@ index eaa24bd6147f161e0a00df91a2375d7f259ce0d2..d054bee8c7c6f6bf608252f21b2f5192 net.pl3x.purpur.command.DemoCommand.register(this.dispatcher); // Purpur net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 1e1784d181d07fe4927817dcee71970141b436be..e236b8b64c867dab2b3d45df129df0260af4fccc 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -162,6 +162,7 @@ public class PurpurConfig { public static String afkBroadcastBack = "%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; @@ -36,11 +36,11 @@ index 1e1784d181d07fe4927817dcee71970141b436be..e236b8b64c867dab2b3d45df129df026 demoCommandOutput = getString("settings.messages.demo-command-output", demoCommandOutput); pingCommandOutput = getString("settings.messages.ping-command-output", pingCommandOutput); } -diff --git a/src/main/java/net/pl3x/purpur/command/CreditsCommand.java b/src/main/java/net/pl3x/purpur/command/CreditsCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..282be3e0e0cb3137829a88bd40fa18772dc344c2 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/CreditsCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java @@ -0,0 +1,35 @@ +package net.pl3x.purpur.command; + diff --git a/patches/server/0072-Configurable-jockey-options.patch b/patches/server/0072-Configurable-jockey-options.patch index b2d8944b7..1efb15c4b 100644 --- a/patches/server/0072-Configurable-jockey-options.patch +++ b/patches/server/0072-Configurable-jockey-options.patch @@ -166,10 +166,10 @@ index f30b36b3f1153e1cbd9b8242909d9ba8c995df1d..76f1bbec2b8ebe037de65ee5ec718e17 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 1e0896ed38cf0d861f25d23c6ebe6a0be4742132..ccf64226afaf2242be106935ae57ab88450ae0ec 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -538,6 +538,9 @@ public class PurpurWorldConfig { public boolean drownedRidableInWater = false; public double drownedMaxHealth = 20.0D; diff --git a/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 3b4232928..53d0106a0 100644 --- a/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -257,10 +257,10 @@ index 7e0affe953585b19686bb21b31a6a2b9534aba10..b651ff470853c1c6af2f2c56848a002b private class PhantomMoveControl extends net.pl3x.purpur.controller.FlyingMoveControllerWASD { // Purpur private float speed = 0.1F; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index ccf64226afaf2242be106935ae57ab88450ae0ec..3e5bfd0acdc99c6fcf929d3b244080a4c9df99d4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -951,6 +951,9 @@ public class PurpurWorldConfig { public int phantomFlameFireTime = 8; public boolean phantomAllowGriefing = false; diff --git a/patches/server/0074-Add-phantom-spawning-options.patch b/patches/server/0074-Add-phantom-spawning-options.patch index 06eab72f2..9ef491cbd 100644 --- a/patches/server/0074-Add-phantom-spawning-options.patch +++ b/patches/server/0074-Add-phantom-spawning-options.patch @@ -47,10 +47,10 @@ index 1e21d6cf2f03219fb2b7217c9a72bdd83c2146f7..dad5d3c754395b39e96be1e35a99c8bf for (int l = 0; l < k; ++l) { // Paper start -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 3e5bfd0acdc99c6fcf929d3b244080a4c9df99d4..688a6a8c2e587a27e8c9c684feb06a68354a7921 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -954,6 +954,18 @@ public class PurpurWorldConfig { public double phantomAttackedByCrystalRadius = 0.0D; public float phantomAttackedByCrystalDamage = 1.0F; diff --git a/patches/server/0075-Implement-bed-explosion-options.patch b/patches/server/0075-Implement-bed-explosion-options.patch index 61f906430..f8ec03ef0 100644 --- a/patches/server/0075-Implement-bed-explosion-options.patch +++ b/patches/server/0075-Implement-bed-explosion-options.patch @@ -26,10 +26,10 @@ index 20c0030d566012146021613325c6a979f392740e..340e5dee8bf5d8a865c19a8fe63399ae return InteractionResult.SUCCESS; } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 688a6a8c2e587a27e8c9c684feb06a68354a7921..0f312498ca942f152d8a4aa385b4840097660330 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -292,6 +292,22 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch b/patches/server/0076-Implement-respawn-anchor-explosion-options.patch index e7393d0f4..5b3c613fe 100644 --- a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0076-Implement-respawn-anchor-explosion-options.patch @@ -17,10 +17,10 @@ index 07e893f1859abe3c2a765694c21309d60346ca82..0fabe3ec1e9d7dae952db1f1e3dd3af8 } public static boolean canSetSpawn(Level world) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 0f312498ca942f152d8a4aa385b4840097660330..f871295169e6ea75a3e6da9bc9cc15b48835dd4c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -336,6 +336,22 @@ public class PurpurWorldConfig { waterInfiniteRequiredSources = getInt("blocks.water.infinite-required-sources", waterInfiniteRequiredSources); } diff --git a/patches/server/0077-Add-allow-water-in-end-world-option.patch b/patches/server/0077-Add-allow-water-in-end-world-option.patch index 5562e8ee5..e9867ffbf 100644 --- a/patches/server/0077-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0077-Add-allow-water-in-end-world-option.patch @@ -67,10 +67,10 @@ index 2676cddca511ea775766cec0001269407599df6e..096d6a07cd44cc674b53e5d3759e44f2 world.removeBlock(pos, false); } else { world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState()); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index e236b8b64c867dab2b3d45df129df0260af4fccc..5252ce6eb6bd9b7383bef17ec5a3087db43dbeef 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -239,6 +239,11 @@ public class PurpurConfig { enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } diff --git a/patches/server/0079-Entity-lifespan.patch b/patches/server/0079-Entity-lifespan.patch index 7c01b028d..1bdec4e7c 100644 --- a/patches/server/0079-Entity-lifespan.patch +++ b/patches/server/0079-Entity-lifespan.patch @@ -88,10 +88,10 @@ index d936cf11ece70d528e5a0d1176fdbafd9b8f9d93..198fe041d20e7ed21b47d5c22dcc121a return flag; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f871295169e6ea75a3e6da9bc9cc15b48835dd4c..48d207b696acebb9be35b43f46e98dd11448f0e6 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -112,6 +112,11 @@ public class PurpurWorldConfig { elytraDamagePerTridentBoost = getInt("gameplay-mechanics.elytra.damage-per-boost.trident", elytraDamagePerTridentBoost); } diff --git a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 5a83870bf..2ceee99aa 100644 --- a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -54,10 +54,10 @@ index 782c49ebd9574aa68de4693fec20c6130f656c23..17828733fff18cb3159dd75280aa1f1b this.hurt(DamageSource.IN_WALL, (float) Math.max(1, Mth.floor(-d0 * d1))); } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 48d207b696acebb9be35b43f46e98dd11448f0e6..0936ed03cf94cf534535524561791ef454b1df7e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -231,6 +231,7 @@ public class PurpurWorldConfig { public boolean playerInvulnerableWhileAcceptingResourcePack = false; public String playerDeathExpDropEquation = "expLevel * 7"; diff --git a/patches/server/0081-Squid-EAR-immunity.patch b/patches/server/0081-Squid-EAR-immunity.patch index 80339773d..4d9782d57 100644 --- a/patches/server/0081-Squid-EAR-immunity.patch +++ b/patches/server/0081-Squid-EAR-immunity.patch @@ -4,10 +4,10 @@ Date: Mon, 13 Jul 2020 13:49:41 -0500 Subject: [PATCH] Squid EAR immunity -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 0936ed03cf94cf534535524561791ef454b1df7e..49817bb4fb106bccde979bd2a854d24ede409d56 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1287,6 +1287,7 @@ public class PurpurWorldConfig { public boolean squidRidable = false; diff --git a/patches/server/0082-Phantoms-burn-in-light.patch b/patches/server/0082-Phantoms-burn-in-light.patch index 9e48d8a76..ee5367bc9 100644 --- a/patches/server/0082-Phantoms-burn-in-light.patch +++ b/patches/server/0082-Phantoms-burn-in-light.patch @@ -46,10 +46,10 @@ index b651ff470853c1c6af2f2c56848a002b066802f5..edb28f9424af0d1973231729785b6ec6 if (!list.isEmpty()) { list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error Iterator iterator = list.iterator(); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 49817bb4fb106bccde979bd2a854d24ede409d56..52741957c8b9572c22185f89e05cd5724975cc6b 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1005,6 +1005,9 @@ public class PurpurWorldConfig { public int phantomSpawnOverheadRadius = 10; public int phantomSpawnMinPerAttempt = 1; diff --git a/patches/server/0083-Configurable-villager-breeding.patch b/patches/server/0083-Configurable-villager-breeding.patch index 684820530..29efc021b 100644 --- a/patches/server/0083-Configurable-villager-breeding.patch +++ b/patches/server/0083-Configurable-villager-breeding.patch @@ -17,10 +17,10 @@ index d195212838e253d7a479a89c6650bb008c5daadd..145607300ed953e88b0f9fc1fc61bc34 } private boolean hungry() { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 52741957c8b9572c22185f89e05cd5724975cc6b..8da468573da0743a4869cfae8b72182d7e231cc5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1430,6 +1430,7 @@ public class PurpurWorldConfig { public boolean villagerCanBeLeashed = false; public int villagerSpawnIronGolemRadius = 0; diff --git a/patches/server/0084-Redstone-deactivates-spawners.patch b/patches/server/0084-Redstone-deactivates-spawners.patch index 3bbd74e10..baa67889b 100644 --- a/patches/server/0084-Redstone-deactivates-spawners.patch +++ b/patches/server/0084-Redstone-deactivates-spawners.patch @@ -16,10 +16,10 @@ index 03726227fdd60e9cf77213d50184abff438e01ef..76979991d2ded84161e8a0fc72cbb2d2 return world.isAffectsSpawningPlayerNearby((double) pos.getX() + 0.5D, (double) pos.getY() + 0.5D, (double) pos.getZ() + 0.5D, (double) this.requiredPlayerRange); // Paper } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8da468573da0743a4869cfae8b72182d7e231cc5..7d41d9c5e35bb451f214b67b20c05e30f63ab9d4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -364,6 +364,11 @@ public class PurpurWorldConfig { signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit); } diff --git a/patches/server/0085-Totems-work-in-inventory.patch b/patches/server/0085-Totems-work-in-inventory.patch index 3e0e2acac..d2daff9f0 100644 --- a/patches/server/0085-Totems-work-in-inventory.patch +++ b/patches/server/0085-Totems-work-in-inventory.patch @@ -28,10 +28,10 @@ index 17828733fff18cb3159dd75280aa1f1b32ac088f..4904abec73580eee50c12a8edcb6e743 EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity()); event.setCancelled(itemstack == null); this.level.getCraftServer().getPluginManager().callEvent(event); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7d41d9c5e35bb451f214b67b20c05e30f63ab9d4..d10be85bd30dcf5eba755152954be35a43e8b8b4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -232,6 +232,7 @@ public class PurpurWorldConfig { public String playerDeathExpDropEquation = "expLevel * 7"; public int playerDeathExpDropMax = 100; diff --git a/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch index 57ca78c84..a1bb92c4a 100644 --- a/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch @@ -29,10 +29,10 @@ index 730fd18cd9dc334fe527283a2ba5e5259fbfead5..c611dd58a7697093087c6d2c3b47cf85 return spawnGroupData; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index d10be85bd30dcf5eba755152954be35a43e8b8b4..8c93cddf6a1afb442a383f2fbb2d8ba279d337bd 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1459,6 +1459,7 @@ public class PurpurWorldConfig { public boolean vindicatorRidable = false; public boolean vindicatorRidableInWater = false; diff --git a/patches/server/0087-Add-option-to-disable-certain-block-updates.patch b/patches/server/0087-Add-option-to-disable-certain-block-updates.patch index fef380ce9..e1641ad7b 100644 --- a/patches/server/0087-Add-option-to-disable-certain-block-updates.patch +++ b/patches/server/0087-Add-option-to-disable-certain-block-updates.patch @@ -124,10 +124,10 @@ index 16e11e31077f160198e0b04abdfeabb97ed20c6f..0512b3701a3bf33891ab6281355c07af world.setBlock(pos, (BlockState) state.setValue(NoteBlock.POWERED, flag1), 3); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 5252ce6eb6bd9b7383bef17ec5a3087db43dbeef..01872f312cbbfc6ffd2fc2a8dff208bd026fe97f 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -244,6 +244,15 @@ public class PurpurConfig { allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); } diff --git a/patches/server/0088-Dispensers-place-anvils-option.patch b/patches/server/0088-Dispensers-place-anvils-option.patch index 92a30cd50..4b410ff09 100644 --- a/patches/server/0088-Dispensers-place-anvils-option.patch +++ b/patches/server/0088-Dispensers-place-anvils-option.patch @@ -40,10 +40,10 @@ index 59db245fe11384282af84ec1d5be08ab0e9484ca..a08eebaa08a75be4e7e8f6d560740ea1 } static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8c93cddf6a1afb442a383f2fbb2d8ba279d337bd..bad29754e48433e211b5c163c270fafaeb6794f4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -318,8 +318,10 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0089-Allow-anvil-colors.patch b/patches/server/0089-Allow-anvil-colors.patch index 69b74d440..b45a12492 100644 --- a/patches/server/0089-Allow-anvil-colors.patch +++ b/patches/server/0089-Allow-anvil-colors.patch @@ -36,10 +36,10 @@ index 3751ce065a38cb55b0800f000e33b2b32c7e0f5d..c8b6c5c65a4cd3a53b300358513f96ac itemstack1.setHoverName(new TextComponent(this.itemName)); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index bad29754e48433e211b5c163c270fafaeb6794f4..7bc99c280d16aa22f083c5d644c4ee3bec0bae49 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -301,6 +301,11 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch index a8c41688f..d205bc13e 100644 --- a/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch @@ -16,10 +16,10 @@ index f34e1c342562a509539f2176a91e6132cd6672b2..27747e712a5964b43a7fe1d11165740b return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100 && this.dolphin.level.getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7bc99c280d16aa22f083c5d644c4ee3bec0bae49..4f35036bb4dc7a6325e7a35f1623139da39e31d9 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -550,6 +550,7 @@ public class PurpurWorldConfig { public float dolphinSpitSpeed = 1.0F; public float dolphinSpitDamage = 2.0F; diff --git a/patches/server/0091-Short-enderman-height.patch b/patches/server/0091-Short-enderman-height.patch index 0740dca9b..b357646f0 100644 --- a/patches/server/0091-Short-enderman-height.patch +++ b/patches/server/0091-Short-enderman-height.patch @@ -30,10 +30,10 @@ index 71b472e3fefe549fe959fda1702213bac3c3e7d4..490b8d674a0f1ae75de89fcadb2894da } else if (source instanceof IndirectEntityDamageSource) { Entity entity = source.getDirectEntity(); boolean flag; -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 01872f312cbbfc6ffd2fc2a8dff208bd026fe97f..f9f0fe89bba6279b4038fbf214b158774cea3032 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -239,6 +239,12 @@ public class PurpurConfig { enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } diff --git a/patches/server/0092-Stop-squids-floating-on-top-of-water.patch b/patches/server/0092-Stop-squids-floating-on-top-of-water.patch index 73ca64f54..28fd9c981 100644 --- a/patches/server/0092-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0092-Stop-squids-floating-on-top-of-water.patch @@ -53,10 +53,10 @@ index 120498a39b7ca7aee9763084507508d4a1c425aa..0dfc639043998cd3bd32afaaf8153459 + } + // Purpur } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 4f35036bb4dc7a6325e7a35f1623139da39e31d9..65ce3df6703f11bb77e4b8687b035b83cc7b8dd3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1310,6 +1310,7 @@ public class PurpurWorldConfig { public boolean squidRidable = false; public double squidMaxHealth = 10.0D; diff --git a/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch index 4ea1162e1..c03df3423 100644 --- a/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch @@ -17,10 +17,10 @@ index 5d76674d5e181f012c0686e9915556bc93087706..4a7626819fe7c3cad694072b9ae57371 }; private final LevelAccessor level; private final Direction.Axis axis; -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index f9f0fe89bba6279b4038fbf214b158774cea3032..2494c566ac34914f38484dafe1197dab0285515a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -207,6 +207,7 @@ public class PurpurConfig { public static int barrelRows = 3; public static boolean enderChestSixRows = false; diff --git a/patches/server/0094-Entities-can-use-portals-configuration.patch b/patches/server/0094-Entities-can-use-portals-configuration.patch index 9585a6de5..d714d1f70 100644 --- a/patches/server/0094-Entities-can-use-portals-configuration.patch +++ b/patches/server/0094-Entities-can-use-portals-configuration.patch @@ -26,10 +26,10 @@ index a12058f714b7f3ccb8f7121ac242af5bb2d4911e..48cf0a22ff28c7e2ce87c7fcb5ceafac } public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 65ce3df6703f11bb77e4b8687b035b83cc7b8dd3..f6eafc276ae98430dee2ab65897e201136d1d285 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -287,6 +287,7 @@ public class PurpurWorldConfig { public boolean useBetterMending = false; public boolean boatEjectPlayersOnLand = false; diff --git a/patches/server/0096-Customizable-wither-health-and-healing.patch b/patches/server/0096-Customizable-wither-health-and-healing.patch index 074f6df8b..6519c486b 100644 --- a/patches/server/0096-Customizable-wither-health-and-healing.patch +++ b/patches/server/0096-Customizable-wither-health-and-healing.patch @@ -22,10 +22,10 @@ index b106e046eaadd99dce3b48b222f29d57efe12f66..9ba855af05a80bef63be043f3672996a } this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth()); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f6eafc276ae98430dee2ab65897e201136d1d285..6f8dcbaf5bd02b6ce1e613e69b51e29a1c891867 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1521,6 +1521,8 @@ public class PurpurWorldConfig { public boolean witherRidableInWater = false; public double witherMaxY = 256D; diff --git a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch index e7b46b272..d0dae6996 100644 --- a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch @@ -93,10 +93,10 @@ index 323eea2bccacfcc85849b5d82c2b30d991e0c0d8..bb5918ff947eb4cc4d0c964b2a8a9166 if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) { blockposition1 = blockposition2; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 6f8dcbaf5bd02b6ce1e613e69b51e29a1c891867..2a140b22698de57254978178cd5609bf6b63fb5d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -73,6 +73,12 @@ public class PurpurWorldConfig { return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path)); } diff --git a/patches/server/0098-Raid-cooldown-setting.patch b/patches/server/0098-Raid-cooldown-setting.patch index d3013a3d7..85afc4412 100644 --- a/patches/server/0098-Raid-cooldown-setting.patch +++ b/patches/server/0098-Raid-cooldown-setting.patch @@ -51,10 +51,10 @@ index e8dd1fdf1a3b697a2e040424df49ac6527b68312..120f77f52ef493f16c2bd8fbc8d8d0a4 if (!this.raidMap.containsKey(raid.getId())) { this.raidMap.put(raid.getId(), raid); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2a140b22698de57254978178cd5609bf6b63fb5d..16be9ddb79404db1d65b36b2b79cdb15cb8b122c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -313,6 +313,7 @@ public class PurpurWorldConfig { public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; diff --git a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch index 6828bf6b0..3bde0c4bb 100644 --- a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch @@ -288,10 +288,10 @@ index 2867e841e73a3edfdeb83af9d96e0d0cd4116a68..8613008090a9d7cf5cd7c2a598f2c725 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 16be9ddb79404db1d65b36b2b79cdb15cb8b122c..8721b4b757776e8d2d66c1ec492b5e7249850459 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -273,6 +273,35 @@ public class PurpurWorldConfig { totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory); } diff --git a/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch index f70ae96a5..ca5efcf29 100644 --- a/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -70,10 +70,10 @@ index f5551d121d4bd633ce8d667433e1def6e2fcbb8e..6f636ddea90e89fa17fa76d25b93ab50 this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true)); this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8721b4b757776e8d2d66c1ec492b5e7249850459..d67c6a67e2c632b36ac28746195efd1cea1077d3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1642,6 +1642,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyOnlyBaby = true; public double zombieJockeyChance = 0.05D; diff --git a/patches/server/0102-Flying-squids-Oh-my.patch b/patches/server/0102-Flying-squids-Oh-my.patch index 43f2e6ac0..3a4f0b20f 100644 --- a/patches/server/0102-Flying-squids-Oh-my.patch +++ b/patches/server/0102-Flying-squids-Oh-my.patch @@ -57,10 +57,10 @@ index 82d657e431a5a2317e5be80f3b2898a5c7371a42..9a99904bd761df5861f68533279ebde3 float f = this.squid.getRandom().nextFloat() * 6.2831855F; float f1 = Mth.cos(f) * 0.2F; float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index d67c6a67e2c632b36ac28746195efd1cea1077d3..e2b3e7849b5e1a2a18a05a36e6947dd15d1811b4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -807,9 +807,11 @@ public class PurpurWorldConfig { public boolean glowSquidRidable = false; diff --git a/patches/server/0103-Infinity-bow-settings.patch b/patches/server/0103-Infinity-bow-settings.patch index d7f635b5b..218f9c50e 100644 --- a/patches/server/0103-Infinity-bow-settings.patch +++ b/patches/server/0103-Infinity-bow-settings.patch @@ -26,10 +26,10 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c return InteractionResultHolder.fail(itemstack); } else { user.startUsingItem(hand); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e2b3e7849b5e1a2a18a05a36e6947dd15d1811b4..dfae718aa318ecceea7efee1d2b1c85ebfd85256 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -123,6 +123,17 @@ public class PurpurWorldConfig { entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan); } diff --git a/patches/server/0104-Stonecutter-damage.patch b/patches/server/0104-Stonecutter-damage.patch index 0ad63a430..b8aad3696 100644 --- a/patches/server/0104-Stonecutter-damage.patch +++ b/patches/server/0104-Stonecutter-damage.patch @@ -60,10 +60,10 @@ index 5e28c09d782166be6d0fbc6778ef9f6c4d7af409..ce891b7d8e5cbc956c28b8bb8c5c9976 return BlockPathTypes.DAMAGE_OTHER; } else if (blockState.is(Blocks.HONEY_BLOCK)) { return BlockPathTypes.STICKY_HONEY; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index dfae718aa318ecceea7efee1d2b1c85ebfd85256..eed7ae9bc36120e05a48c5f1c1ef61c101b720ef 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -443,6 +443,11 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } diff --git a/patches/server/0105-Configurable-daylight-cycle.patch b/patches/server/0105-Configurable-daylight-cycle.patch index 6cdaee41f..7839cbd9f 100644 --- a/patches/server/0105-Configurable-daylight-cycle.patch +++ b/patches/server/0105-Configurable-daylight-cycle.patch @@ -69,10 +69,10 @@ index 7c84f20ce15525c4b8af4f03e3d67af08f8e1a03..da197e74b1a7b5831b98628198879dd7 } public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index eed7ae9bc36120e05a48c5f1c1ef61c101b720ef..41cd7abb09259eedfb8ea21d273b0cbb6d6ae35e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -105,6 +105,13 @@ public class PurpurWorldConfig { armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight); } diff --git a/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch index 6ad2cb120..7f259bfc2 100644 --- a/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch @@ -16,10 +16,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c + return other instanceof MendingEnchantment ? net.pl3x.purpur.PurpurConfig.allowInfinityMending : super.checkCompatibility(other); } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 2494c566ac34914f38484dafe1197dab0285515a..2f367f1e7ed64264577403a2c309ec426fcb7bbf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -241,6 +241,16 @@ public class PurpurConfig { cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame); } diff --git a/patches/server/0107-Furnace-uses-lava-from-underneath.patch b/patches/server/0107-Furnace-uses-lava-from-underneath.patch index 19a8e3935..747c78735 100644 --- a/patches/server/0107-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0107-Furnace-uses-lava-from-underneath.patch @@ -47,10 +47,10 @@ index fb15ece736dde16066818216749fb2efba0b3b21..600a71b8da335ddfc70f782cbbb08647 } private static boolean canBurn(@Nullable Recipe recipe, NonNullList slots, int count) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 41cd7abb09259eedfb8ea21d273b0cbb6d6ae35e..bb0a8fc8d37a44b5ec2fdb008d48796d50182c14 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -406,6 +406,17 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 98a1c5893..a7f9df14c 100644 --- a/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -23,10 +23,10 @@ index 603e621b16deb63b0d6d7e59e05a8de1831e067f..56233465693943e0fdb998e44a34f802 if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index bb0a8fc8d37a44b5ec2fdb008d48796d50182c14..287942965fa805cbbbdb2752d5f6fe4b8e1862d5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -402,8 +402,10 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch index 4481ff47c..6f1da88a4 100644 --- a/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch @@ -94,10 +94,10 @@ index 468a2cc47734bf7a406ab833ce145a35194f67ec..409baf096e9a9cfecc6159313d4f91b1 this.generator = gen; this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 287942965fa805cbbbdb2752d5f6fe4b8e1862d5..96229ee36ff6d6f18d371095baaa9e2833c88ae0 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -361,6 +361,7 @@ public class PurpurWorldConfig { public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; @@ -114,10 +114,10 @@ index 287942965fa805cbbbdb2752d5f6fe4b8e1862d5..96229ee36ff6d6f18d371095baaa9e28 } public boolean anvilAllowColors = false; -diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java b/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java index 6e7f56fe2b78d7a09d5d130f2c88338fb8ae628e..cd63e9e556fa4931ab33c63931cf916757c51a62 100644 ---- a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java -+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java +--- a/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/PurpurCommand.java @@ -49,6 +49,7 @@ public class PurpurCommand extends Command { PurpurConfig.init((File) console.options.valueOf("purpur-settings")); for (ServerLevel level : console.getAllLevels()) { diff --git a/patches/server/0111-Make-entity-breeding-times-configurable.patch b/patches/server/0111-Make-entity-breeding-times-configurable.patch index 513343e93..bb5f44a3c 100644 --- a/patches/server/0111-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0111-Make-entity-breeding-times-configurable.patch @@ -475,10 +475,10 @@ index 3ec9b8343cf80ceea8503ad78863a4b539c6ef6b..c536b0f0d0ebe5b6b6409972eb711f84 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 96229ee36ff6d6f18d371095baaa9e2833c88ae0..92f303aa5122183073abf2043c0ed3cb54fbc782 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -481,9 +481,11 @@ public class PurpurWorldConfig { public boolean axolotlRidable = false; diff --git a/patches/server/0112-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0112-Apply-display-names-from-item-forms-of-entities-to-e.patch index e52623c4a..33d26ceb3 100644 --- a/patches/server/0112-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0112-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -141,10 +141,10 @@ index 0284201b0bb0f5c9a4a2393cf0d83e8e21262df3..1f46a2be362ed5f60a7ca75916fe7bd4 } if (((HangingEntity) object).survives()) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 92f303aa5122183073abf2043c0ed3cb54fbc782..02842e0a9e8f2548c5ebdadfab681183d6e63320 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -101,8 +101,10 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index def83f403..82df822e1 100644 --- a/patches/server/0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -16,10 +16,10 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155 if (event.isPersistent() && newEntityLiving instanceof Mob) { ((Mob) newEntityLiving).setPersistenceRequired(); // Paper end -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 02842e0a9e8f2548c5ebdadfab681183d6e63320..daf9c24425e3ecc8d9e8c3147842ea316d414788 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -102,9 +102,11 @@ public class PurpurWorldConfig { public float armorstandStepHeight = 0.0F; diff --git a/patches/server/0114-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0114-Add-twisting-and-weeping-vines-growth-rates.patch index bb2fdcdc5..ec50c43c9 100644 --- a/patches/server/0114-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0114-Add-twisting-and-weeping-vines-growth-rates.patch @@ -81,10 +81,10 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index daf9c24425e3ecc8d9e8c3147842ea316d414788..b1a47a8bc3a23b2f214efb1caca0bba1364c41ad 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -402,6 +402,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index 92e973939..83009b3ae 100644 --- a/patches/server/0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -102,10 +102,10 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca + } // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b1a47a8bc3a23b2f214efb1caca0bba1364c41ad..dd9d39ed0fe3a170e6b024fd42e5c99d9312e410 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -403,8 +403,10 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 08b85a61f..4748848b5 100644 --- a/patches/server/0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -20,10 +20,10 @@ index 490b8d674a0f1ae75de89fcadb2894da55c32d4e..28d2ccc6b29b17a99a2828d044259ada } private static class EndermanFreezeWhenLookedAt extends Goal { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index dd9d39ed0fe3a170e6b024fd42e5c99d9312e410..63aad596da417b9e13a8a157408ac91e79d1048e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -785,6 +785,7 @@ public class PurpurWorldConfig { public boolean endermanRidableInWater = false; public double endermanMaxHealth = 40.0D; diff --git a/patches/server/0117-Add-configurable-snowball-damage.patch b/patches/server/0117-Add-configurable-snowball-damage.patch index 8753de2e4..62d5b637d 100644 --- a/patches/server/0117-Add-configurable-snowball-damage.patch +++ b/patches/server/0117-Add-configurable-snowball-damage.patch @@ -17,10 +17,10 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd entity.hurt(DamageSource.thrown(this, this.getOwner()), (float)i); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 63aad596da417b9e13a8a157408ac91e79d1048e..e034ffef119e36e8beee125bfdaa821aba63fcaf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -295,6 +295,11 @@ public class PurpurWorldConfig { totemOfUndyingWorksInInventory = getBoolean("gameplay-mechanics.player.totem-of-undying-works-in-inventory", totemOfUndyingWorksInInventory); } diff --git a/patches/server/0118-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0118-Changeable-Mob-Left-Handed-Chance.patch index b90f157fa..3bc328d5e 100644 --- a/patches/server/0118-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0118-Changeable-Mob-Left-Handed-Chance.patch @@ -17,10 +17,10 @@ index 198fe041d20e7ed21b47d5c22dcc121a8d388623..6a8347ceefd663066de5887fef8ebc82 this.setLeftHanded(true); } else { this.setLeftHanded(false); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e034ffef119e36e8beee125bfdaa821aba63fcaf..b58de3cc86dbeae9fc4fa612f46ef9b75432965c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -130,8 +130,10 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0119-Add-boat-fall-damage-config.patch b/patches/server/0119-Add-boat-fall-damage-config.patch index 591b39da3..7df01519f 100644 --- a/patches/server/0119-Add-boat-fall-damage-config.patch +++ b/patches/server/0119-Add-boat-fall-damage-config.patch @@ -26,10 +26,10 @@ index 80a57d726ee663aa37a3b93c883f835a2ebc765e..e07095a3ed1af5a8bb7715c264535ae9 boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && "fall".equals(source.msgId); if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b58de3cc86dbeae9fc4fa612f46ef9b75432965c..ff2ad3f56afa0828037adc27c5f36c555269fc67 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -365,6 +365,7 @@ public class PurpurWorldConfig { public boolean useBetterMending = false; diff --git a/patches/server/0120-Snow-Golem-rate-of-fire-config.patch b/patches/server/0120-Snow-Golem-rate-of-fire-config.patch index 338c2aa1c..d61fbee0d 100644 --- a/patches/server/0120-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0120-Snow-Golem-rate-of-fire-config.patch @@ -22,10 +22,10 @@ index dbd005660d70918fe5a9d0f5c74f6b7d7fb03c3f..093211be0d86cc114cbb109d7ba01f49 this.goalSelector.addGoal(2, new WaterAvoidingRandomStrollGoal(this, 1.0D, 1.0000001E-5F)); this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(4, new RandomLookAroundGoal(this)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index ff2ad3f56afa0828037adc27c5f36c555269fc67..f7d9795f163d44c95a2ff6c883c3b1f7f1a34bcf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1468,6 +1468,10 @@ public class PurpurWorldConfig { public double snowGolemMaxHealth = 4.0D; public boolean snowGolemDropsPumpkin = true; diff --git a/patches/server/0121-EMC-Configurable-disable-give-dropping.patch b/patches/server/0121-EMC-Configurable-disable-give-dropping.patch index db8ea5f99..2d4050123 100644 --- a/patches/server/0121-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0121-EMC-Configurable-disable-give-dropping.patch @@ -19,10 +19,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12 if (bl && itemStack.isEmpty()) { itemStack.setCount(1); ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 2f367f1e7ed64264577403a2c309ec426fcb7bbf..192e272a33925b7a1f1937d2348f874857eb25ed 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -204,6 +204,11 @@ public class PurpurConfig { useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive); } diff --git a/patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index ee289c8e2..b357f647f 100644 --- a/patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -182,10 +182,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612 public static final VillagerProfession FARMER = register("farmer", PoiType.FARMER, ImmutableSet.of(Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT_SEEDS, Items.BONE_MEAL), ImmutableSet.of(Blocks.FARMLAND), SoundEvents.VILLAGER_WORK_FARMER); public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f7d9795f163d44c95a2ff6c883c3b1f7f1a34bcf..459f48b3bf3667b6768a05496b9fb564ed1af09d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1641,6 +1641,8 @@ public class PurpurWorldConfig { public int villagerSpawnIronGolemLimit = 0; public boolean villagerCanBreed = true; diff --git a/patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 4bb768d2d..fc03acb73 100644 --- a/patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -34,10 +34,10 @@ index 76f1bbec2b8ebe037de65ee5ec718e17a6081c13..f8b742ee8e637edd8e8b05aff2fcc7a7 this.setLastHurtByPlayer((Player) entityliving); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 459f48b3bf3667b6768a05496b9fb564ed1af09d..18bb80875573b5bb35ab9ec448dcb3992407a56d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1860,6 +1860,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; diff --git a/patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch index e0cb3244b..ac447c2bb 100644 --- a/patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -200,10 +200,10 @@ index 2e20a37663f48bd606157e22d466267699c8ed21..1c971eaf2fca2d1cdc89809f673e49de return super.mobInteract(player, hand); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 18bb80875573b5bb35ab9ec448dcb3992407a56d..da0849e6e38a2c54410bd158b16f8f3e79e60066 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1753,6 +1753,8 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; diff --git a/patches/server/0126-Configurable-default-collar-color.patch b/patches/server/0126-Configurable-default-collar-color.patch index 2c290aebf..9f6fc1ddc 100644 --- a/patches/server/0126-Configurable-default-collar-color.patch +++ b/patches/server/0126-Configurable-default-collar-color.patch @@ -44,10 +44,10 @@ index 1c971eaf2fca2d1cdc89809f673e49de107a4a46..a669a00d68807ed451a1b0def7a92e17 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index da0849e6e38a2c54410bd158b16f8f3e79e60066..4e889a369b1bf75e6ed3f175997b4604eaeb4414 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -588,6 +588,7 @@ public class PurpurWorldConfig { public boolean catRidable = false; diff --git a/patches/server/0127-Phantom-flames-on-swoop.patch b/patches/server/0127-Phantom-flames-on-swoop.patch index 0477b3b9c..97b873d56 100644 --- a/patches/server/0127-Phantom-flames-on-swoop.patch +++ b/patches/server/0127-Phantom-flames-on-swoop.patch @@ -16,10 +16,10 @@ index edb28f9424af0d1973231729785b6ec67b599dbd..c3fde22e1cf98881da66e70870ced65f } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 4e889a369b1bf75e6ed3f175997b4604eaeb4414..f9f393c36cc809c35845c4ab3732a22311d8f378 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1178,6 +1178,7 @@ public class PurpurWorldConfig { public float phantomFlameDamage = 1.0F; public int phantomFlameFireTime = 8; diff --git a/patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch index 803a263e9..181f5b9b7 100644 --- a/patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -16,10 +16,10 @@ index db726697b00afdee6078849fd224263483349912..c808664a67a9604e40ab388c6d0e6ac3 BlockPos blockposition1 = pos.above(); return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f9f393c36cc809c35845c4ab3732a22311d8f378..469d001170e2aa18475efaab25e1f48105b47218 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -418,6 +418,11 @@ public class PurpurWorldConfig { caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge); } diff --git a/patches/server/0129-Implement-TPSBar.patch b/patches/server/0129-Implement-TPSBar.patch index cb5158068..9fb25e540 100644 --- a/patches/server/0129-Implement-TPSBar.patch +++ b/patches/server/0129-Implement-TPSBar.patch @@ -104,10 +104,10 @@ index f50f884430781ddf58bb2db13bf3982c8ec0a817..8fb52533367cab298c9a0b2ef2f47123 ServerLevel worldserver = entityplayer.getLevel(); entityplayer.awardStat(Stats.LEAVE_GAME); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 192e272a33925b7a1f1937d2348f874857eb25ed..294be16a809f4fe7f62de51648b25f26e2a5b82a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -209,6 +209,29 @@ public class PurpurConfig { disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops); } @@ -138,11 +138,11 @@ index 192e272a33925b7a1f1937d2348f874857eb25ed..294be16a809f4fe7f62de51648b25f26 public static int barrelRows = 3; public static boolean enderChestSixRows = false; public static boolean enderChestPermissionRows = false; -diff --git a/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java b/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..2eca7b78907007be9683d87bf2346c87816ec3f0 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/TPSBarCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java @@ -0,0 +1,21 @@ +package net.pl3x.purpur.command; + @@ -165,11 +165,11 @@ index 0000000000000000000000000000000000000000..2eca7b78907007be9683d87bf2346c87 + ).setPermission("bukkit.command.tpsbar"); + } +} -diff --git a/src/main/java/net/pl3x/purpur/task/BossBarTask.java b/src/main/java/net/pl3x/purpur/task/BossBarTask.java +diff --git a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java new file mode 100644 index 0000000000000000000000000000000000000000..89122d7bcfd037a22d277e562f5300f2f3eab2db --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/task/BossBarTask.java ++++ b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java @@ -0,0 +1,109 @@ +package net.pl3x.purpur.task; + @@ -280,11 +280,11 @@ index 0000000000000000000000000000000000000000..89122d7bcfd037a22d277e562f5300f2 + TPSBarTask.instance().removePlayer(player); + } +} -diff --git a/src/main/java/net/pl3x/purpur/task/TPSBarTask.java b/src/main/java/net/pl3x/purpur/task/TPSBarTask.java +diff --git a/src/main/java/org/purpurmc/purpur/task/TPSBarTask.java b/src/main/java/org/purpurmc/purpur/task/TPSBarTask.java new file mode 100644 index 0000000000000000000000000000000000000000..cafb140ff57e5697d7c3705ff9be6411c0ad82d9 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/task/TPSBarTask.java ++++ b/src/main/java/org/purpurmc/purpur/task/TPSBarTask.java @@ -0,0 +1,142 @@ +package net.pl3x.purpur.task; + diff --git a/patches/server/0130-Striders-give-saddle-back.patch b/patches/server/0130-Striders-give-saddle-back.patch index 10a57d887..296768a3e 100644 --- a/patches/server/0130-Striders-give-saddle-back.patch +++ b/patches/server/0130-Striders-give-saddle-back.patch @@ -27,10 +27,10 @@ index 672801ab77a10917147f12b2117a3390885b39b0..b4f7d6f4b7e6f6d5fe9e472f1723430c player.startRiding(this); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 469d001170e2aa18475efaab25e1f48105b47218..14110f925bb60819a50fabad7705c26f87e77f19 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1553,6 +1553,7 @@ public class PurpurWorldConfig { public boolean striderRidableInWater = false; public double striderMaxHealth = 20.0D; diff --git a/patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch index c7a009fe9..382b53aed 100644 --- a/patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch @@ -25,10 +25,10 @@ index 42becbb21eee4e1b0a14e2fc3e226f0de26c96b1..0a8c8a24af17262be3e656042dc5c8bc } protected ItemCooldowns createItemCooldowns() { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 14110f925bb60819a50fabad7705c26f87e77f19..d77e802ac6c62b1cda8d1f67b41dd3c6d67f8e2a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -267,6 +267,19 @@ public class PurpurWorldConfig { villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate); } diff --git a/patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch index 8c5739a0a..e667a5741 100644 --- a/patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch @@ -392,10 +392,10 @@ index b942e7c85e6c8f9a7664d9e5bf93bcd79e0651f1..5b29f3fced5435e172dd69f6f4eb265e } return true; // Purpur end -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index d77e802ac6c62b1cda8d1f67b41dd3c6d67f8e2a..245f602c5511b11ef7572cbff7e31db5e76ea545 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -381,8 +381,11 @@ public class PurpurWorldConfig { public boolean boatsDoFallDamage = true; public boolean disableDropsOnCrammingDeath = false; diff --git a/patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch index 68f5d5417..bfaf40fe2 100644 --- a/patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -21,10 +21,10 @@ index 0512b3701a3bf33891ab6281355c07af6be5b9c1..d79cf8df4be544c4402a2419cd9238bd // CraftBukkit start org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE)); if (!event.isCancelled()) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 245f602c5511b11ef7572cbff7e31db5e76ea545..e2239c1a5ea8d8c91d0cd247fa0b4dbc255eeab5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -384,6 +384,7 @@ public class PurpurWorldConfig { public boolean entitiesPickUpLootBypassMobGriefing = false; public boolean fireballsBypassMobGriefing = false; diff --git a/patches/server/0136-Add-EntityTeleportHinderedEvent.patch b/patches/server/0136-Add-EntityTeleportHinderedEvent.patch index ed7de7a2b..f8301dddf 100644 --- a/patches/server/0136-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0136-Add-EntityTeleportHinderedEvent.patch @@ -77,10 +77,10 @@ index 500a4013ce525c0474fe3991457d4c2a50ceb7ed..e0beee6bd772792fbd3bc6a856230311 ServerLevel worldserver = (ServerLevel) world; blockEntity.teleportCooldown = 100; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e2239c1a5ea8d8c91d0cd247fa0b4dbc255eeab5..1719201a0da3d0da8500a2e138bd0a6234502b9b 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -383,6 +383,7 @@ public class PurpurWorldConfig { public boolean entitiesCanUsePortals = true; public boolean entitiesPickUpLootBypassMobGriefing = false; diff --git a/patches/server/0137-Farmland-trampling-changes.patch b/patches/server/0137-Farmland-trampling-changes.patch index 84b22b3c7..28b31b5dc 100644 --- a/patches/server/0137-Farmland-trampling-changes.patch +++ b/patches/server/0137-Farmland-trampling-changes.patch @@ -36,10 +36,10 @@ index caf40e3df0896492be959f9e0bcfb1fad0bfa2ef..10f1e3d9c35ee80587865cf0035416ae // Purpur end if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 1719201a0da3d0da8500a2e138bd0a6234502b9b..90d764834b2210dbc655a46a5f4512afe8dd7d70 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -456,10 +456,16 @@ public class PurpurWorldConfig { public boolean farmlandBypassMobGriefing = false; public boolean farmlandGetsMoistFromBelow = false; diff --git a/patches/server/0138-Movement-options-for-armor-stands.patch b/patches/server/0138-Movement-options-for-armor-stands.patch index 8c7d2967d..9439d1428 100644 --- a/patches/server/0138-Movement-options-for-armor-stands.patch +++ b/patches/server/0138-Movement-options-for-armor-stands.patch @@ -65,10 +65,10 @@ index 50370dc8697569a4e5cf8ec3714d227a59357d64..e9e24435057cff9c0af758ca2aa822c3 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 90d764834b2210dbc655a46a5f4512afe8dd7d70..4c65643e508d4c80a3e8f76d7f7fd1f128bd646f 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -103,10 +103,16 @@ public class PurpurWorldConfig { public float armorstandStepHeight = 0.0F; public boolean armorstandSetNameVisible = false; diff --git a/patches/server/0139-Fix-stuck-in-portals.patch b/patches/server/0139-Fix-stuck-in-portals.patch index 1caf7e679..edddbadf1 100644 --- a/patches/server/0139-Fix-stuck-in-portals.patch +++ b/patches/server/0139-Fix-stuck-in-portals.patch @@ -36,10 +36,10 @@ index 1428e4f1aa8262ff33c789c419451ecef192116f..197326d2831f804620fbfe289a1617ec } this.isInsidePortal = true; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 4c65643e508d4c80a3e8f76d7f7fd1f128bd646f..2840cea2cb04cc011f7670fccd29cea8dc861d6d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -297,6 +297,7 @@ public class PurpurWorldConfig { public int playerDeathExpDropMax = 100; public boolean teleportIfOutsideBorder = false; diff --git a/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch index e5adaef09..719064037 100644 --- a/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch @@ -1173,10 +1173,10 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2840cea2cb04cc011f7670fccd29cea8dc861d6d..096e8d68982b982722681d8a543558614202ed06 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -574,6 +574,7 @@ public class PurpurWorldConfig { useNightVisionWhenRiding = getBoolean("ridable-settings.use-night-vision", useNightVisionWhenRiding); } diff --git a/patches/server/0141-Config-to-always-tame-in-Creative.patch b/patches/server/0141-Config-to-always-tame-in-Creative.patch index 446621383..cba824295 100644 --- a/patches/server/0141-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0141-Config-to-always-tame-in-Creative.patch @@ -58,10 +58,10 @@ index b039cbbcc33a6b1925d1cf4339018219ceb6c2ad..57e8ef6f7c20d74fdc25d9ab2a9c35b1 this.tame(player); this.navigation.stop(); this.setTarget((LivingEntity) null); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 096e8d68982b982722681d8a543558614202ed06..59b9082ad765120b743605de9f8ccbb9cbcd588c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -385,6 +385,7 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0142-End-crystal-explosion-options.patch b/patches/server/0142-End-crystal-explosion-options.patch index 7d06ab47a..33c0b6caf 100644 --- a/patches/server/0142-End-crystal-explosion-options.patch +++ b/patches/server/0142-End-crystal-explosion-options.patch @@ -51,10 +51,10 @@ index f8863cabad1bd0c3c2c62b8e17612d9559237d68..06c6addfa2a8dab1ad52a3588e9aeba5 } this.onDestroyedBy(source); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 59b9082ad765120b743605de9f8ccbb9cbcd588c..60d6c0e75ca4e74adc33b951111bae7f178cd0ac 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -463,6 +463,35 @@ public class PurpurWorldConfig { dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils); } diff --git a/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 89542d2e0..125a045b7 100644 --- a/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -28,10 +28,10 @@ index 29351213075a26b5beefeeba012d05fc9c986696..b6f1ad54cdacafb0995a992ff3990a55 return false; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 60d6c0e75ca4e74adc33b951111bae7f178cd0ac..b8dfe1a519a1777b3e0c5644dc82ef89edbb034b 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -896,6 +896,7 @@ public class PurpurWorldConfig { public boolean enderDragonAlwaysDropsFullExp = false; public boolean enderDragonBypassMobGriefing = false; diff --git a/patches/server/0144-Dont-run-with-scissors.patch b/patches/server/0144-Dont-run-with-scissors.patch index e560fe12a..a063409de 100644 --- a/patches/server/0144-Dont-run-with-scissors.patch +++ b/patches/server/0144-Dont-run-with-scissors.patch @@ -35,10 +35,10 @@ index cbd434897155095b3689d0adc274df7749a83192..a196c669891b09c42751004bd76d9c40 private boolean isPlayerCollidingWithAnythingNew(LevelReader world, AABB box) { Iterable iterable = world.getCollisions(this.player, this.player.getBoundingBox().deflate(9.999999747378752E-6D)); VoxelShape voxelshape = Shapes.create(box.deflate(9.999999747378752E-6D)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 294be16a809f4fe7f62de51648b25f26e2a5b82a..dcb9394208df25e1d6fcf9bafa31864b37b5db51 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -165,6 +165,7 @@ public class PurpurConfig { public static String creditsCommandOutput = "%s has been shown the end credits"; public static String demoCommandOutput = "%s has been shown the demo screen"; @@ -55,10 +55,10 @@ index 294be16a809f4fe7f62de51648b25f26e2a5b82a..dcb9394208df25e1d6fcf9bafa31864b } public static String serverModName = "Purpur"; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b8dfe1a519a1777b3e0c5644dc82ef89edbb034b..38fefd5ff631df27ee05b5f8776f1466d15022bd 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -157,6 +157,8 @@ public class PurpurWorldConfig { public List itemImmuneToExplosion = new ArrayList<>(); public List itemImmuneToFire = new ArrayList<>(); diff --git a/patches/server/0145-One-Punch-Man.patch b/patches/server/0145-One-Punch-Man.patch index cfae174e0..fd69fbe2f 100644 --- a/patches/server/0145-One-Punch-Man.patch +++ b/patches/server/0145-One-Punch-Man.patch @@ -29,10 +29,10 @@ index e0c5947610ab711024c0ef6346f2ca9a87701139..61c59634533fd3ebe79219ccc9d4e351 if (f > 0 || !human) { if (human) { // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 38fefd5ff631df27ee05b5f8776f1466d15022bd..c816e073d6e3293e75fb3f18a03ea80782c3f15a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -302,6 +302,7 @@ public class PurpurWorldConfig { public boolean teleportIfOutsideBorder = false; public boolean totemOfUndyingWorksInInventory = false; diff --git a/patches/server/0146-Add-config-for-snow-on-blue-ice.patch b/patches/server/0146-Add-config-for-snow-on-blue-ice.patch index e5e1d7387..574b628e0 100644 --- a/patches/server/0146-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0146-Add-config-for-snow-on-blue-ice.patch @@ -28,10 +28,10 @@ index fbbb0155bd66f1daa160e03f866741d903e1869e..86f7b4117b8b9bd36e38962e3290f7b9 } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index c816e073d6e3293e75fb3f18a03ea80782c3f15a..885f535396622aa2ceb1335ef84ad142e03549e3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -524,6 +524,11 @@ public class PurpurWorldConfig { furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath); } diff --git a/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index 63c5c30d4..d21c73d50 100644 --- a/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -42,10 +42,10 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f } else { // Paper end if (user instanceof net.minecraft.server.level.ServerPlayer) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 885f535396622aa2ceb1335ef84ad142e03549e3..7f779df11c73e366fb807d7aece7bba88e1cbcb4 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -159,6 +159,10 @@ public class PurpurWorldConfig { public List itemImmuneToLightning = new ArrayList<>(); public boolean dontRunWithScissors = false; diff --git a/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch index a4d88a837..a8c8601c1 100644 --- a/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -17,10 +17,10 @@ index 8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd..0294e31bb7a4346fd9a3b45ef0bed558 return Either.left(Player.BedSleepingProblem.NOT_SAFE); } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7f779df11c73e366fb807d7aece7bba88e1cbcb4..ff2cdbdb785628e564de0fefaef68b408c5e3e8a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -311,6 +311,7 @@ public class PurpurWorldConfig { public boolean totemOfUndyingWorksInInventory = false; public boolean playerFixStuckPortal = false; diff --git a/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch index cd2d14ad9..48321852a 100644 --- a/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -17,10 +17,10 @@ index a0b347f9daf5e8cf28ec3e308b639d5200c276dd..75d0998d7e6109592400c14c4aee063f this.targetSelector.addGoal(4, new ResetUniversalAngerTargetGoal<>(this, false)); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index ff2cdbdb785628e564de0fefaef68b408c5e3e8a..83534bbdad44c682cf5fdf8a94390f224c5906f1 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -945,6 +945,8 @@ public class PurpurWorldConfig { public boolean endermanDespawnEvenWithBlock = false; public boolean endermanBypassMobGriefing = false; diff --git a/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index 7d815e86c..623547f35 100644 --- a/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -19,10 +19,10 @@ index 75d0998d7e6109592400c14c4aee063f7942961d..13cdfb0175152d2ba203c01f14f2f98d return false; } else { Vec3 vec3d = player.getViewVector(1.0F).normalize(); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 83534bbdad44c682cf5fdf8a94390f224c5906f1..6ab78da881142ee146499a6193cbfa36cc7fc10a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -947,6 +947,8 @@ public class PurpurWorldConfig { public boolean endermanTakeDamageFromWater = true; public boolean endermanAggroEndermites = true; diff --git a/patches/server/0152-Tick-fluids-config.patch b/patches/server/0152-Tick-fluids-config.patch index b40eb7196..f57bd03fe 100644 --- a/patches/server/0152-Tick-fluids-config.patch +++ b/patches/server/0152-Tick-fluids-config.patch @@ -35,10 +35,10 @@ index 11ebadaa2438281a54cffe025a49ee5046a71ba5..07c25a2518eb5ce0da6131ce5ceb10ac world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 6ab78da881142ee146499a6193cbfa36cc7fc10a..241383f4edf4a1ec8d6b92400a6055527a49758c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -413,6 +413,7 @@ public class PurpurWorldConfig { public boolean noteBlockIgnoreAbove = false; public boolean persistentDroppableEntityDisplayNames = false; diff --git a/patches/server/0153-Config-to-disable-Llama-caravans.patch b/patches/server/0153-Config-to-disable-Llama-caravans.patch index 998a0fd11..01470b32e 100644 --- a/patches/server/0153-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0153-Config-to-disable-Llama-caravans.patch @@ -31,10 +31,10 @@ index d0016761c124a4d593b18006efa18757ad385ab0..13fd55f198f36ed6b5d3b242e07535c5 this.caravanHead = llama; this.caravanHead.caravanTail = this; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 241383f4edf4a1ec8d6b92400a6055527a49758c..e068b364782311c24790e23ecfd67e571d75d3a2 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1240,6 +1240,7 @@ public class PurpurWorldConfig { public double llamaMovementSpeedMax = 0.175D; public int llamaBreedingTicks = 6000; diff --git a/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch index 0a46a26d1..d90b0d3d7 100644 --- a/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch @@ -49,10 +49,10 @@ index f6a8d026c2380b9d7ec3121c7e144c6f19f5323c..73b0c8403eca3c26f76e59fc4b057b50 } private void spawnLingeringCloud() { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e068b364782311c24790e23ecfd67e571d75d3a2..a94219011d920e14355b48d1638a0b612d3cb11c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -809,6 +809,7 @@ public class PurpurWorldConfig { public boolean creeperAllowGriefing = true; public boolean creeperBypassMobGriefing = false; diff --git a/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch index 0870863d3..cad863970 100644 --- a/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch @@ -30,10 +30,10 @@ index e9087a46e401bc99b73c2cf2731fdac3e68719f8..e054edf9e7c4eef231e155516433c6fa world.destroyBlock(pos, true, entity); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index a94219011d920e14355b48d1638a0b612d3cb11c..845123a88ded1ca19d28b6a22dbee4bd3b9dcbec 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1580,6 +1580,7 @@ public class PurpurWorldConfig { public double ravagerMaxHealth = 100.0D; public boolean ravagerBypassMobGriefing = false; diff --git a/patches/server/0156-Sneak-to-bulk-process-composter.patch b/patches/server/0156-Sneak-to-bulk-process-composter.patch index 1f5ac928b..ef26cfdd7 100644 --- a/patches/server/0156-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0156-Sneak-to-bulk-process-composter.patch @@ -74,10 +74,10 @@ index fb8b8a9733ac50096d8406487ab1ae167ef5f7b1..16598ca0fd953b6af98dfcdb6716e2e1 public static BlockState insertItem(BlockState iblockdata, ServerLevel worldserver, ItemStack itemstack, BlockPos blockposition, Entity entity) { // CraftBukkit int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 845123a88ded1ca19d28b6a22dbee4bd3b9dcbec..dc036e95b92bf349484f006d22530e0b8516d01a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -474,6 +474,11 @@ public class PurpurWorldConfig { chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop); } diff --git a/patches/server/0157-Config-for-skipping-night.patch b/patches/server/0157-Config-for-skipping-night.patch index 1bf71aa2b..646b36d96 100644 --- a/patches/server/0157-Config-for-skipping-night.patch +++ b/patches/server/0157-Config-for-skipping-night.patch @@ -17,10 +17,10 @@ index da197e74b1a7b5831b98628198879dd7fdeff074..359ba71b137eac65a8ba6c1e5eda7041 // CraftBukkit start j = this.levelData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime()); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index dc036e95b92bf349484f006d22530e0b8516d01a..2c3114fba8dc6d52cc4f4eef9b350aa93ab266e1 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -312,6 +312,7 @@ public class PurpurWorldConfig { public boolean playerFixStuckPortal = false; public boolean creativeOnePunch = false; diff --git a/patches/server/0158-Add-config-for-villager-trading.patch b/patches/server/0158-Add-config-for-villager-trading.patch index c0c50b8ee..10bc01549 100644 --- a/patches/server/0158-Add-config-for-villager-trading.patch +++ b/patches/server/0158-Add-config-for-villager-trading.patch @@ -30,10 +30,10 @@ index e5b78c9d6fb326771d65ea9afd9da38c204922f0..1a8df13b06b1ac5e5a7d63033b4a5326 this.setTradingPlayer(player); this.openTradingScreen(player, this.getDisplayName(), 1); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2c3114fba8dc6d52cc4f4eef9b350aa93ab266e1..276abd030cfdec1a41b81ddbc844b3736fe272af 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1952,6 +1952,7 @@ public class PurpurWorldConfig { public boolean villagerClericFarmersThrowWarts = true; public boolean villagerBypassMobGriefing = false; diff --git a/patches/server/0159-Allow-infinity-on-crossbows.patch b/patches/server/0159-Allow-infinity-on-crossbows.patch index f4da084ae..2ee9540de 100644 --- a/patches/server/0159-Allow-infinity-on-crossbows.patch +++ b/patches/server/0159-Allow-infinity-on-crossbows.patch @@ -64,10 +64,10 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757 }; public abstract boolean canEnchant(Item item); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index dcb9394208df25e1d6fcf9bafa31864b37b5db51..5421be4de201bb09a66bf5e1c4ed537838a8f686 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -272,6 +272,7 @@ public class PurpurConfig { } diff --git a/patches/server/0160-Drowning-Settings.patch b/patches/server/0160-Drowning-Settings.patch index e8890145e..a77c7a1cb 100644 --- a/patches/server/0160-Drowning-Settings.patch +++ b/patches/server/0160-Drowning-Settings.patch @@ -48,10 +48,10 @@ index 61c59634533fd3ebe79219ccc9d4e35137f1a2aa..4b88efb67d1d3522c4520e0aa4c8f45c } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 276abd030cfdec1a41b81ddbc844b3736fe272af..75cfd4d62bff28829f490b89c5800d17dbfc42c7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -122,6 +122,15 @@ public class PurpurWorldConfig { nighttimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.nighttime", nighttimeTicks); } diff --git a/patches/server/0161-Break-individual-slabs-when-sneaking.patch b/patches/server/0161-Break-individual-slabs-when-sneaking.patch index 0ed8d98d3..85bd832a7 100644 --- a/patches/server/0161-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0161-Break-individual-slabs-when-sneaking.patch @@ -46,10 +46,10 @@ index 54df5c2987822a727a31be2b3769d39fabb6159a..70b6a65a7d321fc71c98289f09f21cca + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 75cfd4d62bff28829f490b89c5800d17dbfc42c7..83d1ac76f93bbba8d07c19cfc0fe67d6861ac491 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -606,6 +606,11 @@ public class PurpurWorldConfig { signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit); } diff --git a/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch index 5d794fb1f..5d0cc42e4 100644 --- a/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -21,10 +21,10 @@ index 457880c9e894a83d88505cf0b7235df919eea591..9c38fdb23853ebdca7b8d904760a3958 if (world.getBrightness(LightLayer.SKY, pos) > random.nextInt(32)) { return false; } else if (world.getBrightness(LightLayer.BLOCK, pos) > 0) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 83d1ac76f93bbba8d07c19cfc0fe67d6861ac491..681ccd22efa6145ac571eef034aeb38dbfc274ee 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -553,8 +553,12 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch index 524804a8a..d9230dda1 100644 --- a/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -16,10 +16,10 @@ index e9e24435057cff9c0af758ca2aa822c3b1c3593d..8634431cabae82b71f409f02c84dda2d } public ArmorStand(Level world, double x, double y, double z) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 681ccd22efa6145ac571eef034aeb38dbfc274ee..87827692b0ea864b7d7d1c79761d2f3436f6d432 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -106,6 +106,7 @@ public class PurpurWorldConfig { public boolean armorstandMovement = true; public boolean armorstandWaterMovement = true; diff --git a/patches/server/0164-Option-to-make-doors-require-redstone.patch b/patches/server/0164-Option-to-make-doors-require-redstone.patch index 44a60673f..ff6bcee69 100644 --- a/patches/server/0164-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0164-Option-to-make-doors-require-redstone.patch @@ -66,10 +66,10 @@ index 1df52a9c86c01696a8bc9f84a2082387160b3eeb..a4b9c5da133e2e8ad45d447e3f184cb1 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 87827692b0ea864b7d7d1c79761d2f3436f6d432..9ae0773835689b308987a72424cb7422aea5b714 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -499,6 +499,16 @@ public class PurpurWorldConfig { dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils); } diff --git a/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch index a66fdbb56..2d7e5dcb2 100644 --- a/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch @@ -74,10 +74,10 @@ index 7ed8ae3a92d631dcfc155790dbc2fdd4a3e39d1c..03271cdffd99ab443904a5d1da05d79c public void addTagElement(String key, net.minecraft.nbt.Tag element) { this.getOrCreateTag().put(key, element); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 5421be4de201bb09a66bf5e1c4ed537838a8f686..966c699c377f722e4dfb5da3d19831f99563644c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -273,6 +273,7 @@ public class PurpurConfig { public static boolean allowInfinityMending = false; diff --git a/patches/server/0166-Configurable-sponge-absorption.patch b/patches/server/0166-Configurable-sponge-absorption.patch index a56532d2a..06e2d5d67 100644 --- a/patches/server/0166-Configurable-sponge-absorption.patch +++ b/patches/server/0166-Configurable-sponge-absorption.patch @@ -42,10 +42,10 @@ index 842997ea9f25a05d74a2e8300e44cc39a7e9cd96..97b4e3c0d2b1bbde77b135b8595c3bfa break; } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 9ae0773835689b308987a72424cb7422aea5b714..ee05d89dab1264b3d5d5334bd186c4b6e93fa2c2 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -632,6 +632,13 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } diff --git a/patches/server/0167-Projectile-offset-config.patch b/patches/server/0167-Projectile-offset-config.patch index 2d2e774a5..7275eba03 100644 --- a/patches/server/0167-Projectile-offset-config.patch +++ b/patches/server/0167-Projectile-offset-config.patch @@ -95,10 +95,10 @@ index 5beaafec0759543d3bddf99028c97d0d005be209..086f746cc632a90c67a6c30ea9197c5b if (entityhuman.getAbilities().instabuild) { entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index ee05d89dab1264b3d5d5334bd186c4b6e93fa2c2..20d3893b494dc9be2c469df2731e3dd3f6721cb3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -381,6 +381,23 @@ public class PurpurWorldConfig { witherSkullDespawnRate = getInt("gameplay-mechanics.projectile-despawn-rates.wither_skull", witherSkullDespawnRate); } diff --git a/patches/server/0168-Config-for-powered-rail-activation-distance.patch b/patches/server/0168-Config-for-powered-rail-activation-distance.patch index 2e23e742f..881ff95a4 100644 --- a/patches/server/0168-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0168-Config-for-powered-rail-activation-distance.patch @@ -17,10 +17,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b return false; } else { int j = pos.getX(); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 20d3893b494dc9be2c469df2731e3dd3f6721cb3..78b7cca9f505c218446413ee399fe674994fce29 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -644,6 +644,11 @@ public class PurpurWorldConfig { slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak); } diff --git a/patches/server/0169-Piglin-portal-spawn-modifier.patch b/patches/server/0169-Piglin-portal-spawn-modifier.patch index 914bf4b48..7472d8391 100644 --- a/patches/server/0169-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0169-Piglin-portal-spawn-modifier.patch @@ -30,10 +30,10 @@ index b99a9f76d6e400a053c57a96c9586fe09a4a5a26..41caccb63a6e6ce28cb6fc218dcb8fbd while (world.getBlockState(pos).is((Block) this)) { pos = pos.below(); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 78b7cca9f505c218446413ee399fe674994fce29..acbdab94b72e711541b306424da5a594a284bfa8 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1533,6 +1533,7 @@ public class PurpurWorldConfig { public double piglinMaxHealth = 16.0D; public boolean piglinBypassMobGriefing = false; diff --git a/patches/server/0170-Config-to-change-max-number-of-bees.patch b/patches/server/0170-Config-to-change-max-number-of-bees.patch index 4fed6c654..02d8b0854 100644 --- a/patches/server/0170-Config-to-change-max-number-of-bees.patch +++ b/patches/server/0170-Config-to-change-max-number-of-bees.patch @@ -17,10 +17,10 @@ index 9fcd835d219aafbe113ebb1b796052e07bf2b046..87ee1d0d51fb54702ae5763c01dba863 public BeehiveBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityType.BEEHIVE, pos, state); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 966c699c377f722e4dfb5da3d19831f99563644c..8d207a228855b2a6c0af2e54d815bf17b9217950 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -238,6 +238,7 @@ public class PurpurConfig { public static boolean enderChestSixRows = false; public static boolean enderChestPermissionRows = false; diff --git a/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch index dd5d8fbbc..615c57280 100644 --- a/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch @@ -30,10 +30,10 @@ index 96b4597101a7f3e98ce30bfc301e8ca1620d0fe4..d7845984b5077cdcd40d652c226d5d60 org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()); // CraftBukkit entity.hurt(DamageSource.HOT_FLOOR, 1.0F); org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index acbdab94b72e711541b306424da5a594a284bfa8..e8712c180173262821f280ada807dcbaf0d219f3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -613,6 +613,13 @@ public class PurpurWorldConfig { kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge); } diff --git a/patches/server/0172-Config-for-wither-explosion-radius.patch b/patches/server/0172-Config-for-wither-explosion-radius.patch index c0ce467f5..b35fde0cb 100644 --- a/patches/server/0172-Config-for-wither-explosion-radius.patch +++ b/patches/server/0172-Config-for-wither-explosion-radius.patch @@ -17,10 +17,10 @@ index a66e9826b8283366cec5adb54f79efee47d9df22..6cf8b12e94c17a8111eef5cc0157e4df this.level.getCraftServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e8712c180173262821f280ada807dcbaf0d219f3..a838ed8f2801fd84f5b2ee2984294d5cb1b3dba0 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2110,6 +2110,7 @@ public class PurpurWorldConfig { public boolean witherBypassMobGriefing = false; public boolean witherTakeDamageFromWater = false; diff --git a/patches/server/0173-Gamemode-extra-permissions.patch b/patches/server/0173-Gamemode-extra-permissions.patch index 4d8338307..e03fb6bac 100644 --- a/patches/server/0173-Gamemode-extra-permissions.patch +++ b/patches/server/0173-Gamemode-extra-permissions.patch @@ -53,10 +53,10 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002 int i = 0; for(ServerPlayer serverPlayer : targets) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 8d207a228855b2a6c0af2e54d815bf17b9217950..3ad1bb745def01b18c14ce8c7d399cf20a8a1a08 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -221,6 +221,7 @@ public class PurpurConfig { public static String commandTPSBarTextColorMedium = ""; public static String commandTPSBarTextColorLow = ""; diff --git a/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index 60405d3fd..f8553380c 100644 --- a/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch @@ -17,10 +17,10 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2 BlockState blockState3 = null; if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) { level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index a838ed8f2801fd84f5b2ee2984294d5cb1b3dba0..bb29f18d8b97ac93324534181e356c86a42d3278 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -398,6 +398,21 @@ public class PurpurWorldConfig { snowballProjectileOffset = getDouble("gameplay-mechanics.projectile-offset.snowball", snowballProjectileOffset); } diff --git a/patches/server/0175-Configurable-piston-push-limit.patch b/patches/server/0175-Configurable-piston-push-limit.patch index 558e15ba7..3bbc4f29b 100644 --- a/patches/server/0175-Configurable-piston-push-limit.patch +++ b/patches/server/0175-Configurable-piston-push-limit.patch @@ -35,10 +35,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db return false; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index bb29f18d8b97ac93324534181e356c86a42d3278..591225731b03e8a7b43e25514d11db6f914af3e2 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -635,6 +635,11 @@ public class PurpurWorldConfig { magmaBlockDamageWithFrostWalker = getBoolean("blocks.magma-block.damage-with-frost-walker", magmaBlockDamageWithFrostWalker); } diff --git a/patches/server/0176-Configurable-broadcast-settings.patch b/patches/server/0176-Configurable-broadcast-settings.patch index 415a43959..1d3a13dcc 100644 --- a/patches/server/0176-Configurable-broadcast-settings.patch +++ b/patches/server/0176-Configurable-broadcast-settings.patch @@ -28,10 +28,10 @@ index 0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc..3ad8167804f38262e1e7ecd878fce765 if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != Team.Visibility.ALWAYS) { if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { this.server.getPlayerList().broadcastToTeam(this, ichatbasecomponent); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 3ad1bb745def01b18c14ce8c7d399cf20a8a1a08..f315a6db0c1d2000aa7a506134564b37ff6d2e06 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -178,6 +178,18 @@ public class PurpurConfig { dontRunWithScissors = getString("settings.messages.dont-run-with-scissors", dontRunWithScissors); } diff --git a/patches/server/0178-Configurable-mob-blindness.patch b/patches/server/0178-Configurable-mob-blindness.patch index f16d5a557..1a7ca978a 100644 --- a/patches/server/0178-Configurable-mob-blindness.patch +++ b/patches/server/0178-Configurable-mob-blindness.patch @@ -27,10 +27,10 @@ index 4b88efb67d1d3522c4520e0aa4c8f45c95383222..42131cb0ed7346a6c9e466047a8f4a82 } return d0; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 591225731b03e8a7b43e25514d11db6f914af3e2..5ab2edfc3121a2171c760393f59b8f370fab8005 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -459,6 +459,7 @@ public class PurpurWorldConfig { public boolean persistentDroppableEntityDisplayNames = false; public boolean projectilesBypassMobGriefing = false; diff --git a/patches/server/0179-Hide-hidden-players-from-entity-selector.patch b/patches/server/0179-Hide-hidden-players-from-entity-selector.patch index 69b4aaab4..7f53ae31d 100644 --- a/patches/server/0179-Hide-hidden-players-from-entity-selector.patch +++ b/patches/server/0179-Hide-hidden-players-from-entity-selector.patch @@ -58,10 +58,10 @@ index 35cc3bba20afd4a47160cc674415ba6a3a0ec0ec..39c8cb9494aa516a3d828010a8e3329d + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index f315a6db0c1d2000aa7a506134564b37ff6d2e06..64c85ed460687ccf455e7ac4332e38ec524bd53c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -234,6 +234,7 @@ public class PurpurConfig { public static String commandTPSBarTextColorLow = ""; public static int commandTPSBarTickInterval = 20; diff --git a/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch index 4dd2d92c1..f43f792ec 100644 --- a/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -20,10 +20,10 @@ index 73b0c8403eca3c26f76e59fc4b057b5029e3f014..b8fa29185266df4f432a010ba229d1a6 this.level.getCraftServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { this.dead = true; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 5ab2edfc3121a2171c760393f59b8f370fab8005..775831d7852bd688a613aa9c54988b51b36985e3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -905,6 +905,7 @@ public class PurpurWorldConfig { public boolean creeperBypassMobGriefing = false; public boolean creeperTakeDamageFromWater = false; diff --git a/patches/server/0181-Iron-golem-poppy-calms-anger.patch b/patches/server/0181-Iron-golem-poppy-calms-anger.patch index 43ce94306..1ce78d6b9 100644 --- a/patches/server/0181-Iron-golem-poppy-calms-anger.patch +++ b/patches/server/0181-Iron-golem-poppy-calms-anger.patch @@ -16,10 +16,10 @@ index c96289cc4bf5731862849f491a2049a41c768eed..efe3839f893eefe241dac14b7796baa2 this.goalSelector.addGoal(1, new MeleeAttackGoal(this, 1.0D, true)); this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F)); this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 775831d7852bd688a613aa9c54988b51b36985e3..424fa41a8db31cc40dd17a21539587773d4fc542 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1316,6 +1316,7 @@ public class PurpurWorldConfig { public boolean ironGolemCanSwim = false; public double ironGolemMaxHealth = 100.0D; @@ -36,11 +36,11 @@ index 775831d7852bd688a613aa9c54988b51b36985e3..424fa41a8db31cc40dd17a2153958777 } public boolean llamaRidable = false; -diff --git a/src/main/java/net/pl3x/purpur/entity/ai/ReceiveFlower.java b/src/main/java/net/pl3x/purpur/entity/ai/ReceiveFlower.java +diff --git a/src/main/java/org/purpurmc/purpur/entity/ai/ReceiveFlower.java b/src/main/java/org/purpurmc/purpur/entity/ai/ReceiveFlower.java new file mode 100644 index 0000000000000000000000000000000000000000..efbf2775558e61310dff900a0321964c63f4551d --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/entity/ai/ReceiveFlower.java ++++ b/src/main/java/org/purpurmc/purpur/entity/ai/ReceiveFlower.java @@ -0,0 +1,91 @@ +package net.pl3x.purpur.entity.ai; + diff --git a/patches/server/0182-Breedable-parrots.patch b/patches/server/0182-Breedable-parrots.patch index 958e56cb8..a334f2631 100644 --- a/patches/server/0182-Breedable-parrots.patch +++ b/patches/server/0182-Breedable-parrots.patch @@ -49,10 +49,10 @@ index 953db16af175e14e1a47487659a0346216d8cdbc..5c906b380ad3caceb29fdd5a221cf5ce } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 424fa41a8db31cc40dd17a21539587773d4fc542..564a2009f21e7caf36130e29bab28a27fd012ebf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1466,6 +1466,7 @@ public class PurpurWorldConfig { public double parrotMaxY = 256D; public double parrotMaxHealth = 6.0D; diff --git a/patches/server/0183-Configurable-powered-rail-boost-modifier.patch b/patches/server/0183-Configurable-powered-rail-boost-modifier.patch index 66a34e354..c5307751e 100644 --- a/patches/server/0183-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0183-Configurable-powered-rail-boost-modifier.patch @@ -17,10 +17,10 @@ index 6b58b32711b3aba9b7de9e7dee6d02073dad3b7f..0e6f2d1d48910c573ec2237002a02f33 } else { Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 564a2009f21e7caf36130e29bab28a27fd012ebf..b8b9c307b23ed49e7d21798aa9125e7b64edf200 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -227,6 +227,7 @@ public class PurpurWorldConfig { public boolean minecartControllableFallDamage = true; public double minecartControllableBaseSpeed = 0.1D; diff --git a/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch index a02be608e..56640a7ca 100644 --- a/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch @@ -17,10 +17,10 @@ index 0a8c8a24af17262be3e656042dc5c8bce9364e8a..c7fbd149cc3a12f438b1dfaffba56627 } f += f1; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b8b9c307b23ed49e7d21798aa9125e7b64edf200..aac7e91c5d6e4d9dc2b1b131ac3cd4f4a07a493f 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -326,6 +326,7 @@ public class PurpurWorldConfig { public boolean creativeOnePunch = false; public boolean playerSleepNearMonsters = false; diff --git a/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch index bf11a1bf7..32654ac5d 100644 --- a/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch @@ -18,10 +18,10 @@ index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e7 for (int i = 0; i < 1000; ++i) { BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index aac7e91c5d6e4d9dc2b1b131ac3cd4f4a07a493f..74309929b9bbac31be89d3ddf6774dcbec4f7ded 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -547,6 +547,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0186-Config-for-unverified-username-message.patch b/patches/server/0186-Config-for-unverified-username-message.patch index 9c9b75ea8..891522af5 100644 --- a/patches/server/0186-Config-for-unverified-username-message.patch +++ b/patches/server/0186-Config-for-unverified-username-message.patch @@ -17,10 +17,10 @@ index 33a29890435d6065a2cc4f8e8bf8209c01d5d114..09f2eb149e23b271bab879b84c7910d7 ServerLoginPacketListenerImpl.LOGGER.error("Username '{}' tried to join with an invalid session", gameprofile.getName()); } } catch (AuthenticationUnavailableException authenticationunavailableexception) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 64c85ed460687ccf455e7ac4332e38ec524bd53c..aed55fe54e153b3c8f5181e39e712a457a00c37b 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { public static String demoCommandOutput = "%s has been shown the demo screen"; public static String pingCommandOutput = "%s's ping is %sms"; diff --git a/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch index 878bcb3f6..e2c722ecf 100644 --- a/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch +++ b/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch @@ -17,10 +17,10 @@ index ae7ff760a84620562b2b6b0d1d0fd2f94a09024a..ca0ac66e79a8236fce84a448e6e24a1d } public void setItemName(String newItemName) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index aed55fe54e153b3c8f5181e39e712a457a00c37b..370c1ae524fab837ddcef2419064c5a042a0892a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -257,6 +257,7 @@ public class PurpurConfig { public static boolean enderChestPermissionRows = false; public static boolean cryingObsidianValidForPortalFrame = false; diff --git a/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch index 4ff5a22b2..629552e59 100644 --- a/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch @@ -34,10 +34,10 @@ index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e413 ItemStack itemStack = getColoredItemStack(this.getColor()); blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 74309929b9bbac31be89d3ddf6774dcbec4f7ded..53c1c12316dc0892b55fbbcce6933be3b378fd4a 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -672,6 +672,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch index 7cf371141..e13852e83 100644 --- a/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch @@ -30,10 +30,10 @@ index 87ee1d0d51fb54702ae5763c01dba8632b2234e3..60dbc5c30e928cf00ed58e8fcbc45153 // CraftBukkit end return false; } else { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 53c1c12316dc0892b55fbbcce6933be3b378fd4a..48b74a3c27ee04bae72153d140f90afab029cf15 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -779,6 +779,8 @@ public class PurpurWorldConfig { public double beeMaxHealth = 10.0D; public int beeBreedingTicks = 6000; diff --git a/patches/server/0192-Config-MobEffect-by-world.patch b/patches/server/0192-Config-MobEffect-by-world.patch index 3b0bde905..3a2de2ad0 100644 --- a/patches/server/0192-Config-MobEffect-by-world.patch +++ b/patches/server/0192-Config-MobEffect-by-world.patch @@ -39,10 +39,10 @@ index 8bbb9bdcf95989f1737714655f6f6a269d46d7f2..8d569eb2ec1b2bdbd415094ae04ae531 } ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 48b74a3c27ee04bae72153d140f90afab029cf15..8558521fd931b67e7d4d95dada696658c2b69c93 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -283,6 +283,21 @@ public class PurpurWorldConfig { poweredRailBoostModifier = getDouble("gameplay-mechanics.minecart.powered-rail.boost-modifier", poweredRailBoostModifier); } diff --git a/patches/server/0193-Beacon-Activation-Range-Configurable.patch b/patches/server/0193-Beacon-Activation-Range-Configurable.patch index 4cfcbd725..27b54fc41 100644 --- a/patches/server/0193-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0193-Beacon-Activation-Range-Configurable.patch @@ -25,10 +25,10 @@ index 423560afba1bc03c0bb2b7d5d028451f34e59ec5..080694a06c9fdf57317dd281c4ddbd6c return this.levels * 10 + 10; } else { return effectRange; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8558521fd931b67e7d4d95dada696658c2b69c93..f572a6816203216ed102cb04bd88b3d708389f5c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -512,6 +512,17 @@ public class PurpurWorldConfig { anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors); } diff --git a/patches/server/0194-Add-toggle-for-sand-duping-fix.patch b/patches/server/0194-Add-toggle-for-sand-duping-fix.patch index 33e744e22..3007e2eb6 100644 --- a/patches/server/0194-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0194-Add-toggle-for-sand-duping-fix.patch @@ -26,10 +26,10 @@ index 0c94b4cb6ee0c3dffe0b67a2291d0160ae0ef96f..92a9869dbabcaa704a0da8bc86f75786 return; } // Paper end - fix sand duping -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f572a6816203216ed102cb04bd88b3d708389f5c..981ffd0b8cb204dd64fbc70c6fe3b88e389354cc 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -698,6 +698,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch index bfac41717..77c2e9c5f 100644 --- a/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch @@ -44,10 +44,10 @@ index 46fdaf744080ac01498ca693068616659a79b9ea..ca33161a9a2516031c942282fe26f970 // Paper start - move all of this logic into portal tick entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 981ffd0b8cb204dd64fbc70c6fe3b88e389354cc..862eb9df819143317e949fcc902f0f1736c225d0 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -633,6 +633,11 @@ public class PurpurWorldConfig { furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath); } diff --git a/patches/server/0197-Make-lightning-rod-range-configurable.patch b/patches/server/0197-Make-lightning-rod-range-configurable.patch index 3364ddb0b..5738a93bd 100644 --- a/patches/server/0197-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0197-Make-lightning-rod-range-configurable.patch @@ -17,10 +17,10 @@ index 359ba71b137eac65a8ba6c1e5eda70412eb3550f..a77f715b395c782095df711f22e47f9d return optional.map((blockposition1) -> { return blockposition1.above(1); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 370c1ae524fab837ddcef2419064c5a042a0892a..18b56ce771b5a32364adffed172a12f68790c475 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -258,6 +258,7 @@ public class PurpurConfig { public static boolean cryingObsidianValidForPortalFrame = false; public static int beeInsideBeeHive = 3; diff --git a/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch index 83b714d88..c7f47da0c 100644 --- a/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch @@ -54,10 +54,10 @@ index 2934b6de1f1fb914a532ee20184df99d1acd8e65..65421cfff05c0493f5fef1bdff03172c } public void eat(Item item, ItemStack stack) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 862eb9df819143317e949fcc902f0f1736c225d0..2dc6b2f723f08d633898f9e982c9fb09a0c4c110 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -342,6 +342,7 @@ public class PurpurWorldConfig { public boolean playerSleepNearMonsters = false; public boolean playersSkipNight = true; diff --git a/patches/server/0201-Shulker-spawn-from-bullet-options.patch b/patches/server/0201-Shulker-spawn-from-bullet-options.patch index 28dd1fbe2..949c58636 100644 --- a/patches/server/0201-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0201-Shulker-spawn-from-bullet-options.patch @@ -60,10 +60,10 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2dc6b2f723f08d633898f9e982c9fb09a0c4c110..3312036449d0c28b5ee04abce13f8db2576cd017 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1808,6 +1808,11 @@ public class PurpurWorldConfig { public boolean shulkerRidableInWater = false; public double shulkerMaxHealth = 30.0D; diff --git a/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch index 78892ba97..98745032c 100644 --- a/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch @@ -17,10 +17,10 @@ index 68321b5e425c0500a5691f80203176122cc1bff4..e42f48112725729a9f0c135d2879cfaa public static final Item CAMPFIRE = registerBlock(Blocks.CAMPFIRE, CreativeModeTab.TAB_DECORATIONS); public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS); public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 3312036449d0c28b5ee04abce13f8db2576cd017..fb13ffdb5d8bfb296fd10a5bc8e84bbbb309e4bb 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -174,6 +174,7 @@ public class PurpurWorldConfig { public int enderPearlCooldown = 20; public int enderPearlCooldownCreative = 20; @@ -37,11 +37,11 @@ index 3312036449d0c28b5ee04abce13f8db2576cd017..fb13ffdb5d8bfb296fd10a5bc8e84bbb } public double minecartMaxSpeed = 0.4D; -diff --git a/src/main/java/net/pl3x/purpur/item/GlowBerryItem.java b/src/main/java/net/pl3x/purpur/item/GlowBerryItem.java +diff --git a/src/main/java/org/purpurmc/purpur/item/GlowBerryItem.java b/src/main/java/org/purpurmc/purpur/item/GlowBerryItem.java new file mode 100644 index 0000000000000000000000000000000000000000..d45a39afbef10ae6888e2941faa4b9769ab4a832 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/item/GlowBerryItem.java ++++ b/src/main/java/org/purpurmc/purpur/item/GlowBerryItem.java @@ -0,0 +1,26 @@ +package net.pl3x.purpur.item; + diff --git a/patches/server/0203-Option-to-make-drowned-break-doors.patch b/patches/server/0203-Option-to-make-drowned-break-doors.patch index 048e322f3..01067247d 100644 --- a/patches/server/0203-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0203-Option-to-make-drowned-break-doors.patch @@ -33,10 +33,10 @@ index bd209089f0730674f811d96bdbe7915d6a857729..ddc38e57ae551f4954c8da884648c5ae } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index fb13ffdb5d8bfb296fd10a5bc8e84bbbb309e4bb..92bc2ac4e9ac2a812d8523a1f35e5f865b5fb7c7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1039,6 +1039,7 @@ public class PurpurWorldConfig { public double drownedJockeyChance = 0.05D; public boolean drownedJockeyTryExistingChickens = true; diff --git a/patches/server/0204-Configurable-hunger-starvation-damage.patch b/patches/server/0204-Configurable-hunger-starvation-damage.patch index 381c384f9..0a35e67a6 100644 --- a/patches/server/0204-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0204-Configurable-hunger-starvation-damage.patch @@ -17,10 +17,10 @@ index 65421cfff05c0493f5fef1bdff03172c9e33f33e..63584faeec4e5013be7a377e3203ec16 } this.tickTimer = 0; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 92bc2ac4e9ac2a812d8523a1f35e5f865b5fb7c7..6da884ad810dc1badcf16850e96ce25d3da72e04 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2397,4 +2397,9 @@ public class PurpurWorldConfig { zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater); diff --git a/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch index 58f1ea2c7..75ec89359 100644 --- a/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch +++ b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch @@ -19,11 +19,11 @@ index 2c37694a6055513803708c9fb40fb0c475da8e52..c8e6c5bef67c16cf1bef42fe890bf984 // CraftBukkit end thread.setDaemon(true); -diff --git a/src/main/java/net/pl3x/purpur/PurpurPrintStream.java b/src/main/java/net/pl3x/purpur/PurpurPrintStream.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurPrintStream.java b/src/main/java/org/purpurmc/purpur/PurpurPrintStream.java new file mode 100644 index 0000000000000000000000000000000000000000..f88da0b86a683b25d429ceea4a36d6dde12b2b56 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/PurpurPrintStream.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurPrintStream.java @@ -0,0 +1,65 @@ +/* + * MIT License diff --git a/patches/server/0206-Armor-click-equip-options.patch b/patches/server/0206-Armor-click-equip-options.patch index 0afbdae0e..5796fd03a 100644 --- a/patches/server/0206-Armor-click-equip-options.patch +++ b/patches/server/0206-Armor-click-equip-options.patch @@ -57,10 +57,10 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2 } else { return InteractionResultHolder.fail(itemStack); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 6da884ad810dc1badcf16850e96ce25d3da72e04..4307430bc0074a9061a40415019341926fd685fa 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -345,6 +345,8 @@ public class PurpurWorldConfig { public boolean playersSkipNight = true; public double playerCriticalDamageMultiplier = 1.5D; diff --git a/patches/server/0207-Add-uptime-command.patch b/patches/server/0207-Add-uptime-command.patch index 3c2e1eff0..02a87153a 100644 --- a/patches/server/0207-Add-uptime-command.patch +++ b/patches/server/0207-Add-uptime-command.patch @@ -28,10 +28,10 @@ index e35b469133dc8bdac02e97f8d0792690e568e31c..cfb6a133d8edda91d97eeba0ce911c58 public java.util.Queue processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; public Commands vanillaCommandDispatcher; -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 18b56ce771b5a32364adffed172a12f68790c475..c419af801e31bec057b04131ca5634aad19b343e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { public static String demoCommandOutput = "%s has been shown the demo screen"; public static String pingCommandOutput = "%s's ping is %sms"; @@ -80,11 +80,11 @@ index 18b56ce771b5a32364adffed172a12f68790c475..c419af801e31bec057b04131ca5634aa } public static int barrelRows = 3; -diff --git a/src/main/java/net/pl3x/purpur/command/UptimeCommand.java b/src/main/java/net/pl3x/purpur/command/UptimeCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/UptimeCommand.java b/src/main/java/org/purpurmc/purpur/command/UptimeCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..c63ad24ca4ea4c2bd6239c7fe9beb64e78332e77 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/UptimeCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/UptimeCommand.java @@ -0,0 +1,55 @@ +package net.pl3x.purpur.command; + diff --git a/patches/server/0208-Structure-seed-options.patch b/patches/server/0208-Structure-seed-options.patch index 564e72c99..75fa6d6c6 100644 --- a/patches/server/0208-Structure-seed-options.patch +++ b/patches/server/0208-Structure-seed-options.patch @@ -32,10 +32,10 @@ index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76ef } updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed)); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index c419af801e31bec057b04131ca5634aad19b343e..51283ec0bd1903c0eb3c04c7ed90785795c39311 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -194,6 +194,17 @@ public class PurpurConfig { deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer); } diff --git a/patches/server/0209-Tool-actionable-options.patch b/patches/server/0209-Tool-actionable-options.patch index 11bd92ae3..3113df410 100644 --- a/patches/server/0209-Tool-actionable-options.patch +++ b/patches/server/0209-Tool-actionable-options.patch @@ -108,10 +108,10 @@ index a5c2d6f0c0850a99224a1a8d622fe6b341cee88b..d8777ab86465e25236e7abbafd7ff668 } else { return InteractionResult.PASS; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 4307430bc0074a9061a40415019341926fd685fa..7c945107ada60079ddf9cb9d51390b5a11b21e98 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -472,6 +472,153 @@ public class PurpurWorldConfig { }); } @@ -266,11 +266,11 @@ index 4307430bc0074a9061a40415019341926fd685fa..7c945107ada60079ddf9cb9d51390b5a public boolean useBetterMending = false; public boolean alwaysTameInCreative = false; public boolean boatEjectPlayersOnLand = false; -diff --git a/src/main/java/net/pl3x/purpur/tool/Actionable.java b/src/main/java/net/pl3x/purpur/tool/Actionable.java +diff --git a/src/main/java/org/purpurmc/purpur/tool/Actionable.java b/src/main/java/org/purpurmc/purpur/tool/Actionable.java new file mode 100644 index 0000000000000000000000000000000000000000..9273eb5f5cacf00eedeb5a396616871a3a39a7a0 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/tool/Actionable.java ++++ b/src/main/java/org/purpurmc/purpur/tool/Actionable.java @@ -0,0 +1,24 @@ +package net.pl3x.purpur.tool; + @@ -296,11 +296,11 @@ index 0000000000000000000000000000000000000000..9273eb5f5cacf00eedeb5a396616871a + return drops; + } +} -diff --git a/src/main/java/net/pl3x/purpur/tool/Strippable.java b/src/main/java/net/pl3x/purpur/tool/Strippable.java +diff --git a/src/main/java/org/purpurmc/purpur/tool/Strippable.java b/src/main/java/org/purpurmc/purpur/tool/Strippable.java new file mode 100644 index 0000000000000000000000000000000000000000..c15b623db3331757963a4f565ae842d93471b769 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/tool/Strippable.java ++++ b/src/main/java/org/purpurmc/purpur/tool/Strippable.java @@ -0,0 +1,12 @@ +package net.pl3x.purpur.tool; + @@ -314,11 +314,11 @@ index 0000000000000000000000000000000000000000..c15b623db3331757963a4f565ae842d9 + super(into, drops); + } +} -diff --git a/src/main/java/net/pl3x/purpur/tool/Tillable.java b/src/main/java/net/pl3x/purpur/tool/Tillable.java +diff --git a/src/main/java/org/purpurmc/purpur/tool/Tillable.java b/src/main/java/org/purpurmc/purpur/tool/Tillable.java new file mode 100644 index 0000000000000000000000000000000000000000..ec2e3c4009e7a18592eed677697680926db67247 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/tool/Tillable.java ++++ b/src/main/java/org/purpurmc/purpur/tool/Tillable.java @@ -0,0 +1,50 @@ +package net.pl3x.purpur.tool; + @@ -370,11 +370,11 @@ index 0000000000000000000000000000000000000000..ec2e3c4009e7a18592eed67769768092 + } + } +} -diff --git a/src/main/java/net/pl3x/purpur/tool/Waxable.java b/src/main/java/net/pl3x/purpur/tool/Waxable.java +diff --git a/src/main/java/org/purpurmc/purpur/tool/Waxable.java b/src/main/java/org/purpurmc/purpur/tool/Waxable.java new file mode 100644 index 0000000000000000000000000000000000000000..45a8007a9aaf3f9f11b9387ed4d980fe4f1ab8e3 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/tool/Waxable.java ++++ b/src/main/java/org/purpurmc/purpur/tool/Waxable.java @@ -0,0 +1,12 @@ +package net.pl3x.purpur.tool; + @@ -388,11 +388,11 @@ index 0000000000000000000000000000000000000000..45a8007a9aaf3f9f11b9387ed4d980fe + super(into, drops); + } +} -diff --git a/src/main/java/net/pl3x/purpur/tool/Weatherable.java b/src/main/java/net/pl3x/purpur/tool/Weatherable.java +diff --git a/src/main/java/org/purpurmc/purpur/tool/Weatherable.java b/src/main/java/org/purpurmc/purpur/tool/Weatherable.java new file mode 100644 index 0000000000000000000000000000000000000000..89c6a18580382d011aae000b39e8fede18d7c5ea --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/tool/Weatherable.java ++++ b/src/main/java/org/purpurmc/purpur/tool/Weatherable.java @@ -0,0 +1,12 @@ +package net.pl3x.purpur.tool; + diff --git a/patches/server/0212-Customizable-sleeping-actionbar-messages.patch b/patches/server/0212-Customizable-sleeping-actionbar-messages.patch index b9cfe7771..ddbb133ac 100644 --- a/patches/server/0212-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0212-Customizable-sleeping-actionbar-messages.patch @@ -39,10 +39,10 @@ index a77f715b395c782095df711f22e47f9d07f844af..dfbab7b451656db88e1a7d3a6bf40763 chatmessage = new TranslatableComponent("sleep.players_sleeping", new Object[]{this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(i)}); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 51283ec0bd1903c0eb3c04c7ed90785795c39311..00f3e7b110f38572bb2121b6f2e14e2584f4f60c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -168,6 +168,8 @@ public class PurpurConfig { public static String dontRunWithScissors = "Don't run with scissors!"; public static String uptimeCommandOutput = "Server uptime is "; diff --git a/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch index 351828439..3657cbf2f 100644 --- a/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch +++ b/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch @@ -18,10 +18,10 @@ index 8175bb6331727440da2232998bdad068a1c47ae8..be47543240bd573cd2cc08f84b7eab1c ItemStack itemstack = entity.getItem(); CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7c945107ada60079ddf9cb9d51390b5a11b21e98..c867e1e9aff703f54cfa614c6ad4ac0eadfc9dc9 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -175,6 +175,7 @@ public class PurpurWorldConfig { public int enderPearlCooldownCreative = 20; public float enderPearlEndermiteChance = 0.05F; diff --git a/patches/server/0214-Silk-touchable-budding-amethyst.patch b/patches/server/0214-Silk-touchable-budding-amethyst.patch index c4f3e3057..2da069d01 100644 --- a/patches/server/0214-Silk-touchable-budding-amethyst.patch +++ b/patches/server/0214-Silk-touchable-budding-amethyst.patch @@ -23,10 +23,10 @@ index 02fc3ede12eadbf72e26e31b1c475c7f5b2ad73a..2288e727929ffb3a3bca138fb0289408 + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index c867e1e9aff703f54cfa614c6ad4ac0eadfc9dc9..21c80f579ba9826a330bc3a4ac0136862626d8ca 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -696,6 +696,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0215-Big-dripleaf-tilt-delay.patch b/patches/server/0215-Big-dripleaf-tilt-delay.patch index 6531d996f..b09839fd9 100644 --- a/patches/server/0215-Big-dripleaf-tilt-delay.patch +++ b/patches/server/0215-Big-dripleaf-tilt-delay.patch @@ -23,10 +23,10 @@ index 3f434ac77611a81889b15c118a0fca57cc10a6bb..36d65d85d3cc030551fc0957c1ebbff6 if (i != -1) { world.scheduleTick(blockposition, (Block) this, i); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 21c80f579ba9826a330bc3a4ac0136862626d8ca..df502d2a8c5bfacceec410441c193e77e2c97d8e 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -696,6 +696,22 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0216-Player-ridable-in-water-option.patch b/patches/server/0216-Player-ridable-in-water-option.patch index 86a45d804..15749b8c3 100644 --- a/patches/server/0216-Player-ridable-in-water-option.patch +++ b/patches/server/0216-Player-ridable-in-water-option.patch @@ -20,10 +20,10 @@ index f9247644e528415388911f22ac1833c678947d37..0aec0e4760f0ea0188a0b5c90a9c5526 public boolean setEntityOnShoulder(CompoundTag entityNbt) { if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) { if (this.getShoulderEntityLeft().isEmpty()) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index df502d2a8c5bfacceec410441c193e77e2c97d8e..b28c15180fff218381fbeccc505ed9f04d08e03f 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -349,6 +349,7 @@ public class PurpurWorldConfig { public boolean playerBurpWhenFull = false; public boolean playerArmorSwapping = false; diff --git a/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch index 6f41d00e2..799b2e61a 100644 --- a/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch +++ b/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch @@ -17,10 +17,10 @@ index 13cdfb0175152d2ba203c01f14f2f98d87f812b3..152a4c88fb714e40010b7eaedff03216 Entity entity = source.getDirectEntity(); boolean flag; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b28c15180fff218381fbeccc505ed9f04d08e03f..5f0b1e2b014a1340583c5a1c9d0c8d932d31dcbf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1286,6 +1286,7 @@ public class PurpurWorldConfig { public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false; public boolean endermanIgnorePlayerDragonHead = false; diff --git a/patches/server/0218-Add-compass-command.patch b/patches/server/0218-Add-compass-command.patch index 522f3b724..bd8a6e020 100644 --- a/patches/server/0218-Add-compass-command.patch +++ b/patches/server/0218-Add-compass-command.patch @@ -80,10 +80,10 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..046bf9cbf02b002e89f7d39b616dd0f5 if (isLodestoneCompass(stack)) { CompoundTag compoundTag = stack.getOrCreateTag(); if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) { -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 00f3e7b110f38572bb2121b6f2e14e2584f4f60c..ffc1c2bf3cc6a892a073acb7d873084e3aaa7067 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -252,6 +252,11 @@ public class PurpurConfig { public static String commandTPSBarTextColorMedium = ""; public static String commandTPSBarTextColorLow = ""; @@ -110,10 +110,10 @@ index 00f3e7b110f38572bb2121b6f2e14e2584f4f60c..ffc1c2bf3cc6a892a073acb7d873084e commandGamemodeRequiresPermission = getBoolean("settings.command.gamemode.requires-specific-permission", commandGamemodeRequiresPermission); hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector); uptimeFormat = getString("settings.command.uptime.format", uptimeFormat); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 5f0b1e2b014a1340583c5a1c9d0c8d932d31dcbf..37c96672f890b32892ba8eeac25baab714a3d095 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -176,6 +176,7 @@ public class PurpurWorldConfig { public float enderPearlEndermiteChance = 0.05F; public int glowBerriesEatGlowDuration = 0; @@ -130,11 +130,11 @@ index 5f0b1e2b014a1340583c5a1c9d0c8d932d31dcbf..37c96672f890b32892ba8eeac25baab7 } public double minecartMaxSpeed = 0.4D; -diff --git a/src/main/java/net/pl3x/purpur/command/CompassCommand.java b/src/main/java/net/pl3x/purpur/command/CompassCommand.java +diff --git a/src/main/java/org/purpurmc/purpur/command/CompassCommand.java b/src/main/java/org/purpurmc/purpur/command/CompassCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..5381dfa162dae02c93afcf28d7c6dfb2170ab175 --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/command/CompassCommand.java ++++ b/src/main/java/org/purpurmc/purpur/command/CompassCommand.java @@ -0,0 +1,21 @@ +package net.pl3x.purpur.command; + @@ -157,10 +157,10 @@ index 0000000000000000000000000000000000000000..5381dfa162dae02c93afcf28d7c6dfb2 + ).setPermission("bukkit.command.compass"); + } +} -diff --git a/src/main/java/net/pl3x/purpur/task/BossBarTask.java b/src/main/java/net/pl3x/purpur/task/BossBarTask.java +diff --git a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java index 89122d7bcfd037a22d277e562f5300f2f3eab2db..d4d08946f38e6e29943a310c4b9385d2e092c803 100644 ---- a/src/main/java/net/pl3x/purpur/task/BossBarTask.java -+++ b/src/main/java/net/pl3x/purpur/task/BossBarTask.java +--- a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java ++++ b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java @@ -90,10 +90,12 @@ public abstract class BossBarTask extends BukkitRunnable { public static void startAll() { @@ -188,11 +188,11 @@ index 89122d7bcfd037a22d277e562f5300f2f3eab2db..d4d08946f38e6e29943a310c4b9385d2 + CompassTask.instance().removePlayer(player); } } -diff --git a/src/main/java/net/pl3x/purpur/task/CompassTask.java b/src/main/java/net/pl3x/purpur/task/CompassTask.java +diff --git a/src/main/java/org/purpurmc/purpur/task/CompassTask.java b/src/main/java/org/purpurmc/purpur/task/CompassTask.java new file mode 100644 index 0000000000000000000000000000000000000000..556ac7b6127a3827b686627364a7db9c853a2abd --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/task/CompassTask.java ++++ b/src/main/java/org/purpurmc/purpur/task/CompassTask.java @@ -0,0 +1,52 @@ +package net.pl3x.purpur.task; + diff --git a/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch index bf0529941..b8b241953 100644 --- a/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch +++ b/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch @@ -19,10 +19,10 @@ index 56694c9918ab2e8d0ff5cfda6d60360b0cd16674..c9daf65ce500e29ce8f73d1ec6379fc2 this.stand(); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 37c96672f890b32892ba8eeac25baab714a3d095..1543d6e375246190777e85f1e097e93b187c3edc 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1484,6 +1484,7 @@ public class PurpurWorldConfig { public double horseMovementSpeedMax = 0.3375D; public int horseBreedingTicks = 6000; diff --git a/patches/server/0220-Toggle-for-kinetic-damage.patch b/patches/server/0220-Toggle-for-kinetic-damage.patch index ae8dd9de6..88bd4c3b6 100644 --- a/patches/server/0220-Toggle-for-kinetic-damage.patch +++ b/patches/server/0220-Toggle-for-kinetic-damage.patch @@ -21,10 +21,10 @@ index 8f15148dc81c5370f19edb77b6412c3f97741a0a..0f395aa8e471f724617b391501cdd2f3 } } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 1543d6e375246190777e85f1e097e93b187c3edc..f12c97db301e3f5e9fc32232657a99b67e37c53b 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -138,12 +138,14 @@ public class PurpurWorldConfig { public boolean elytraIgnoreUnbreaking = false; public int elytraDamagePerFireworkBoost = 0; diff --git a/patches/server/0221-Add-Option-for-disable-observer-clocks.patch b/patches/server/0221-Add-Option-for-disable-observer-clocks.patch index 12f3a1d2f..d9b776f4c 100644 --- a/patches/server/0221-Add-Option-for-disable-observer-clocks.patch +++ b/patches/server/0221-Add-Option-for-disable-observer-clocks.patch @@ -17,10 +17,10 @@ index 4a34a08a1d46e4d3020644a51d9e30a36a18791a..be28b5aba28383058548cfb68f982664 this.startSignal(world, pos); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f12c97db301e3f5e9fc32232657a99b67e37c53b..e75dea055def35968285ab258729c387d427771d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -321,6 +321,11 @@ public class PurpurWorldConfig { villageSiegeSpawning = getBoolean("gameplay-mechanics.mob-spawning.village-sieges", predicate); } diff --git a/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch index 6576bac5f..d4167b2d6 100644 --- a/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch +++ b/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch @@ -17,10 +17,10 @@ index 96e5d1210e27b0bca7a354366e5c805709ae4fec..c6ba41c2b4cc96bc97ed2e2220c0f3fa } this.gameEvent(GameEvent.MOB_INTERACT, this.eyeBlockPosition()); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index e75dea055def35968285ab258729c387d427771d..9e9ab8f2a93bba600f5dede7502835e521d33c8c 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2545,6 +2545,8 @@ public class PurpurWorldConfig { public double zombieVillagerJockeyChance = 0.05D; public boolean zombieVillagerJockeyTryExistingChickens = true; diff --git a/patches/server/0223-Option-for-sponges-to-work-on-lava.patch b/patches/server/0223-Option-for-sponges-to-work-on-lava.patch index c1b705f2c..1db433d8d 100644 --- a/patches/server/0223-Option-for-sponges-to-work-on-lava.patch +++ b/patches/server/0223-Option-for-sponges-to-work-on-lava.patch @@ -17,10 +17,10 @@ index 97b4e3c0d2b1bbde77b135b8595c3bfa190a14cb..02b98cfe47d5d2f3c362a84c6b05e734 if (iblockdata.getBlock() instanceof BucketPickup && !((BucketPickup) iblockdata.getBlock()).pickupBlock(blockList, blockposition2, iblockdata).isEmpty()) { // CraftBukkit ++i; if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 9e9ab8f2a93bba600f5dede7502835e521d33c8c..f34480af918082f692038c051a713fda62d7faeb 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -924,9 +924,11 @@ public class PurpurWorldConfig { public int spongeAbsorptionArea = 64; diff --git a/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch index 58dff68c4..82a1a2840 100644 --- a/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch +++ b/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch @@ -17,10 +17,10 @@ index 2943342e6dddc3b89411b7a6548d56b69a201d25..5ca3d7dfadb213530739863571fa6caf // CraftBukkit start - Use relative location for far away sounds // this.world.globalLevelEvent(1023, new BlockPosition(this), 0); //int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index f34480af918082f692038c051a713fda62d7faeb..2b65e68b5b0fdbe73a5d9082a1d6b9e6093adbcf 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2400,6 +2400,7 @@ public class PurpurWorldConfig { public boolean witherTakeDamageFromWater = false; public boolean witherCanRideVehicles = false; diff --git a/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch index 07994f034..467a2b879 100644 --- a/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch +++ b/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch @@ -17,10 +17,10 @@ index fa36ad3bb63764778aa7201d90e331e64292c7b4..dfa06b3c7323aeb12b1e234ca27c924a return false; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2b65e68b5b0fdbe73a5d9082a1d6b9e6093adbcf..2bef007da942d045fa6b2a424c5d0b780ecff2b7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -728,6 +728,11 @@ public class PurpurWorldConfig { buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch); } diff --git a/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch index 62eb6fa6c..a82b49046 100644 --- a/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch +++ b/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch @@ -25,10 +25,10 @@ index 111da6398bb561e58571e47743088ce80416234d..0a2c776b9b1da7d0d4481dd527e0068b } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2bef007da942d045fa6b2a424c5d0b780ecff2b7..85ced4d3abf220dd625349356da2a075503ea037 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -359,6 +359,7 @@ public class PurpurWorldConfig { public boolean playerArmorSwapping = false; public boolean playerArmorSwappingCreativeMakesCopy = true; diff --git a/patches/server/0227-Conduit-behavior-configuration.patch b/patches/server/0227-Conduit-behavior-configuration.patch index 04919721f..4112b0084 100644 --- a/patches/server/0227-Conduit-behavior-configuration.patch +++ b/patches/server/0227-Conduit-behavior-configuration.patch @@ -43,10 +43,10 @@ index 96b6e914441ee1faa059aa5ddcf77ffb74e76ae9..31af7d8111e73169d3e02aa52799a018 world.playSound((Player) null, blockEntity.destroyTarget.getX(), blockEntity.destroyTarget.getY(), blockEntity.destroyTarget.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F); } CraftEventFactory.blockDamage = null; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 85ced4d3abf220dd625349356da2a075503ea037..cb43d8724a3b0324668d415c47df57e93a82b6a5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2606,4 +2606,27 @@ public class PurpurWorldConfig { private void hungerSettings() { hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage); diff --git a/patches/server/0228-Cauldron-fill-chances.patch b/patches/server/0228-Cauldron-fill-chances.patch index efeba7136..34d293f14 100644 --- a/patches/server/0228-Cauldron-fill-chances.patch +++ b/patches/server/0228-Cauldron-fill-chances.patch @@ -17,10 +17,10 @@ index dbae4f3b56d0290c6d28b9beaaa3b459754d43e3..676184c48c3abd8e2fb9a04ae3e165dc } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index cb43d8724a3b0324668d415c47df57e93a82b6a5..2ce74212c5c4f251fba659e8182c43346c98d375 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2629,4 +2629,11 @@ public class PurpurWorldConfig { }); conduitBlocks = conduitBlockList.toArray(Block[]::new); diff --git a/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch index b02aad536..47cdca232 100644 --- a/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch +++ b/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch @@ -17,10 +17,10 @@ index ce891b7d8e5cbc956c28b8bb8c5c9976b7377039..8ecc9099515e38bfe38a5f9ca034cd81 node = this.findAcceptedNode(x, y + 1, z, maxYStep - 1, prevFeetY, direction, nodeType); if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) { double g = (double)(x - direction.getStepX()) + 0.5D; -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 2ce74212c5c4f251fba659e8182c43346c98d375..0b3ba0c4135229f93473bcdfe837db338e01cb4f 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -654,6 +654,7 @@ public class PurpurWorldConfig { public double voidDamageDealt = 4.0D; public int raidCooldownSeconds = 0; diff --git a/patches/server/0231-Shulker-change-color-with-dye.patch b/patches/server/0231-Shulker-change-color-with-dye.patch index 6aec3e237..7c9d53c03 100644 --- a/patches/server/0231-Shulker-change-color-with-dye.patch +++ b/patches/server/0231-Shulker-change-color-with-dye.patch @@ -46,10 +46,10 @@ index 73750ec94993fba1d4e7cf7927bb60166757805a..4739f1e29a748cf69d37e616e0678108 // Purpur end @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 0b3ba0c4135229f93473bcdfe837db338e01cb4f..18a41bb6d8828ae2b3245588b60bb15cd97d68d5 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2017,6 +2017,7 @@ public class PurpurWorldConfig { public double shulkerSpawnFromBulletNearbyRange = 8.0D; public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0"; diff --git a/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index c319bf5b3..72a5e9217 100644 --- a/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -24,10 +24,10 @@ index dfbab7b451656db88e1a7d3a6bf407637da41ff9..1a25629380b29bd919dce1fde0f69fea this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - when passing the night // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 18a41bb6d8828ae2b3245588b60bb15cd97d68d5..eb1e2e4327075df3bc680171ddd84ac6594f9db0 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -655,6 +655,8 @@ public class PurpurWorldConfig { public int raidCooldownSeconds = 0; public int animalBreedingCooldownSeconds = 0; diff --git a/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index b5904a551..0855f0333 100644 --- a/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -44,10 +44,10 @@ index 71e494b949541284b0642dae4b20a6b3ec459828..625ad12e43cc651c986a3b45ce9a7c5b public static final Block MOSS_CARPET = register("moss_carpet", new CarpetBlock(BlockBehaviour.Properties.of(Material.PLANT, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS_CARPET))); public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS))); public static final Block BIG_DRIPLEAF = register("big_dripleaf", new BigDripleafBlock(BlockBehaviour.Properties.of(Material.PLANT).strength(0.1F).sound(SoundType.BIG_DRIPLEAF))); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index eb1e2e4327075df3bc680171ddd84ac6594f9db0..ca4bc68542c96b93f3aa410b21248af8e136d911 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -688,6 +688,11 @@ public class PurpurWorldConfig { anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors); } diff --git a/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch index b91b8f4c7..c144bf8fa 100644 --- a/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch @@ -47,10 +47,10 @@ index a196c669891b09c42751004bd76d9c40ed6924ee..0a3bb5c385a3d7d4e938fe45c295faf0 org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemstack, enumhand); cancelled = event.useItemInHand() == Event.Result.DENY; } else { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index ca4bc68542c96b93f3aa410b21248af8e136d911..b3be28a08fb4296e43db47737bbd3379f1798599 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -360,6 +360,7 @@ public class PurpurWorldConfig { public boolean playerArmorSwappingCreativeMakesCopy = true; public boolean playerRidableInWater = false; diff --git a/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch index 0100629fe..07ed04cd6 100644 --- a/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch @@ -46,10 +46,10 @@ index 591573926eb1358ef82e9e5418be0f1d4ba663cb..68f5f5322521d844c26582606a8d1235 } public static AttributeSupplier.Builder createAttributes() { -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b3be28a08fb4296e43db47737bbd3379f1798599..9deee35a36e1a30a7e567e537ecf68dc918954e8 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1200,6 +1200,7 @@ public class PurpurWorldConfig { public double dolphinMaxHealth = 10.0D; public boolean dolphinDisableTreasureSearching = false; diff --git a/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch index 14741e6d5..6eff68532 100644 --- a/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch @@ -58,10 +58,10 @@ index fa3bbdd27de6382904588213022191a52d9758a0..9009e448c14dedb271abe671d88aff0d } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 9deee35a36e1a30a7e567e537ecf68dc918954e8..41bc2abe5b50041c9ec180ee56c9318009655d88 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1153,7 +1153,14 @@ public class PurpurWorldConfig { public int cowFeedMushrooms = 0; public int cowBreedingTicks = 6000; diff --git a/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch index a23c30e0e..e5883161c 100644 --- a/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch @@ -21,10 +21,10 @@ index 779e0e0ee72cd2835cda69b49b769c1882a55a66..bd279875de63517ce276592835f3d373 super.startSleeping(pos); this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 41bc2abe5b50041c9ec180ee56c9318009655d88..d8cea2024ef8c9a5305d80b233f932449744a599 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -707,11 +707,13 @@ public class PurpurWorldConfig { } diff --git a/patches/server/0240-Halloween-options-and-optimizations.patch b/patches/server/0240-Halloween-options-and-optimizations.patch index a92e97c89..a832cf8da 100644 --- a/patches/server/0240-Halloween-options-and-optimizations.patch +++ b/patches/server/0240-Halloween-options-and-optimizations.patch @@ -59,10 +59,10 @@ index 2bd8dc3f5c0b28fb4ea380b4b4a8672d5ede2a38..52eda2e110839c0845de6cd60445f9a0 this.setItemSlot(EquipmentSlot.HEAD, new ItemStack(this.random.nextFloat() < 0.1F ? Blocks.JACK_O_LANTERN : Blocks.CARVED_PUMPKIN)); this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index d8cea2024ef8c9a5305d80b233f932449744a599..4aaf32fb25ea736d1c489bc14fa1479f00bb77e1 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1504,6 +1504,13 @@ public class PurpurWorldConfig { guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater); } diff --git a/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch index 2b4de19e9..36d6f4e6b 100644 --- a/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch +++ b/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch @@ -35,10 +35,10 @@ index 0bdf874ddb951daf8d469575a44144504472d12d..b54e172fa18adeb563a3c9bda56e5579 }).collect(Collectors.toMap(Entry::getKey, Entry::getValue)); EnchantmentHelper.setEnchantments(map, itemstack1); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index ffc1c2bf3cc6a892a073acb7d873084e3aaa7067..7a8f17af485dc35ba4095e0adcadc8c32b897a9d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -306,6 +306,7 @@ public class PurpurConfig { public static int beeInsideBeeHive = 3; public static boolean anvilCumulativeCost = true; diff --git a/patches/server/0242-UPnP-Port-Forwarding.patch b/patches/server/0242-UPnP-Port-Forwarding.patch index 1ee154db2..770bbc164 100644 --- a/patches/server/0242-UPnP-Port-Forwarding.patch +++ b/patches/server/0242-UPnP-Port-Forwarding.patch @@ -66,10 +66,10 @@ index c8e6c5bef67c16cf1bef42fe890bf984f0fbafa1..24ddef59225faf44773430231f5c7be1 // CraftBukkit start // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index 7a8f17af485dc35ba4095e0adcadc8c32b897a9d..f9d6d5d9ccd648694f5f225f1534202d6b4f0db3 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -391,4 +391,9 @@ public class PurpurConfig { private static void tpsCatchup() { tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup); diff --git a/patches/server/0243-Campfire-option-for-lit-when-placed.patch b/patches/server/0243-Campfire-option-for-lit-when-placed.patch index 9c87f4c07..15cd8a973 100644 --- a/patches/server/0243-Campfire-option-for-lit-when-placed.patch +++ b/patches/server/0243-Campfire-option-for-lit-when-placed.patch @@ -17,10 +17,10 @@ index 0b60b545271e62df86a0eb3c1f0f315a014b24cd..44df9e5034887c756c00bdcfb3ea04d4 } @Override -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 4aaf32fb25ea736d1c489bc14fa1479f00bb77e1..b2f3b50250dd6efada888416e5ea5a17cfd2d7f8 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -982,6 +982,11 @@ public class PurpurWorldConfig { weepingVinesMaxGrowthAge = getInt("blocks.weeping_vines.max-growth-age", weepingVinesMaxGrowthAge); } diff --git a/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch index 696398fe0..d517ae521 100644 --- a/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch +++ b/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch @@ -45,10 +45,10 @@ index d5d84893c77b4e60a19032d765d76bfd24cbbb2b..ef265cec066ef3b84c2b3a4929af5183 @Override protected void onHit(HitResult hitResult) { super.onHit(hitResult); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index b2f3b50250dd6efada888416e5ea5a17cfd2d7f8..7bf38e7b8d95d7e6fb8b2fe32d630382c90cf121 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -179,6 +179,9 @@ public class PurpurWorldConfig { public int glowBerriesEatGlowDuration = 0; public boolean shulkerBoxItemDropContentsWhenDestroyed = true; diff --git a/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch index c5ae13a66..eef8a9a5c 100644 --- a/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch +++ b/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch @@ -17,10 +17,10 @@ index c6ba41c2b4cc96bc97ed2e2220c0f3fa4f31dbe3..22a5d2f0de4bdd4432d1beff840f448a if (!player.getAbilities().instabuild) { itemstack.shrink(1); } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 7bf38e7b8d95d7e6fb8b2fe32d630382c90cf121..c9eb43cbc0478c55cb2cab0d5473805c85ddcce7 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2609,6 +2609,7 @@ public class PurpurWorldConfig { public boolean zombieVillagerTakeDamageFromWater = false; public int zombieVillagerCuringTimeMin = 3600; diff --git a/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch b/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch index 6ef118847..f3d771f2a 100644 --- a/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch +++ b/patches/unapplied/api/0031-Add-StructureGenerateEvent.patch @@ -18,11 +18,11 @@ along with this program. If not, see . Co-authored-by: Mariell Hoversholm -diff --git a/src/main/java/net/pl3x/purpur/event/world/StructureGenerateEvent.java b/src/main/java/net/pl3x/purpur/event/world/StructureGenerateEvent.java +diff --git a/src/main/java/org/purpurmc/purpur/event/world/StructureGenerateEvent.java b/src/main/java/org/purpurmc/purpur/event/world/StructureGenerateEvent.java new file mode 100644 index 0000000000000000000000000000000000000000..e77f45f761368da9b230c425d975a717cf4d10fd --- /dev/null -+++ b/src/main/java/net/pl3x/purpur/event/world/StructureGenerateEvent.java ++++ b/src/main/java/org/purpurmc/purpur/event/world/StructureGenerateEvent.java @@ -0,0 +1,68 @@ +package net.pl3x.purpur.event.world; + diff --git a/patches/unapplied/server/0045-Signs-allow-color-codes.patch b/patches/unapplied/server/0045-Signs-allow-color-codes.patch index 8886162f3..80283d921 100644 --- a/patches/unapplied/server/0045-Signs-allow-color-codes.patch +++ b/patches/unapplied/server/0045-Signs-allow-color-codes.patch @@ -70,10 +70,10 @@ index 6371176fba41218a209ea59b4cafe5b2d4a685fd..f7ab1782c67754a6211c4a67ab8d6057 @Override public ClientboundBlockEntityDataPacket getUpdatePacket() { return ClientboundBlockEntityDataPacket.create(this); -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 5cfccc5a7ee50b24151d6886a1f336c6b217c24e..ea387b513f86249a6ceaa67cb6358dc56ed4b16d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -153,8 +153,10 @@ public class PurpurWorldConfig { }); } diff --git a/patches/unapplied/server/0105-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/unapplied/server/0105-Persistent-TileEntity-Lore-and-DisplayName.patch index de350257e..144f20b09 100644 --- a/patches/unapplied/server/0105-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/unapplied/server/0105-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -190,10 +190,10 @@ index 9b4a464fe820effa906af486cf71a74e283ccd4e..473ab1d7be8a2b8507ecfb7a653a5b0a + } + // Purpur end } -diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 8b330029db238a7c3f9b67b89cb4e9c7efa4ab46..2109f3d8c532f21da732d2d9b375c7f7c03e1ae6 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -339,6 +339,7 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean entitiesCanUsePortals = true;