diff --git a/patches/server/0008-Purpur-Fix-decompile-errors.patch b/patches/server/0008-Purpur-Fix-decompile-errors.patch new file mode 100644 index 00000000..017f0d34 --- /dev/null +++ b/patches/server/0008-Purpur-Fix-decompile-errors.patch @@ -0,0 +1,60 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Sun, 12 Jun 2022 06:20:21 -0500 +Subject: [PATCH] Purpur: Fix decompile errors + +Original license: MIT +Original project: https://github.com/PurpurMC/Purpur + +diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java +index 0c5caad2a5bfc14450cf8d37f988ee176e8d1450..05a0a890a719a957d9aea736d6c0e85bae9e4eec 100644 +--- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java ++++ b/src/main/java/net/minecraft/world/entity/decoration/Painting.java +@@ -124,7 +124,7 @@ public class Painting extends HangingEntity implements VariantHolder { + return entry; +- }).orElseGet(Painting::getDefaultVariant); ++ }).orElseGet(() -> (Holder.Reference) getDefaultVariant()); // Purpur - decompile error + this.setVariant(holder); + this.direction = Direction.from2DDataValue(nbt.getByte("facing")); + super.readAdditionalSaveData(nbt); +diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +index 5956a7759964f5e4939f062e93714fba64f53141..0ca82175ec91ca8b3418c0931682c972666c47f8 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +@@ -182,7 +182,7 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + protected void updateActivity() { +diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +index ac75c54e897565e340b66823caeed92ba1d1641a..769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java ++++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +@@ -70,7 +70,7 @@ public class PiglinBrute extends AbstractPiglin { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + @Override +diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java +index 42f46d338886e2892ee4219d19be4dc97f61616f..fdd3aa81644087bff33a47c5f98e14ca0452f3ef 100644 +--- a/src/main/java/net/minecraft/world/level/block/Blocks.java ++++ b/src/main/java/net/minecraft/world/level/block/Blocks.java +@@ -1127,7 +1127,7 @@ public class Blocks { + } + + private static Boolean ocelotOrParrot(BlockState state, BlockGetter world, BlockPos pos, EntityType type) { +- return (boolean)type == EntityType.OCELOT || type == EntityType.PARROT; ++ return type == EntityType.OCELOT || type == EntityType.PARROT; // Purpur - decompile error + } + + private static BedBlock bed(DyeColor color) { diff --git a/patches/server/0008-Purpur-Implement-TPSBar.patch b/patches/server/0009-Purpur-Implement-TPSBar.patch similarity index 100% rename from patches/server/0008-Purpur-Implement-TPSBar.patch rename to patches/server/0009-Purpur-Implement-TPSBar.patch diff --git a/patches/server/0009-Purpur-Add-compass-command.patch b/patches/server/0010-Purpur-Add-compass-command.patch similarity index 100% rename from patches/server/0009-Purpur-Add-compass-command.patch rename to patches/server/0010-Purpur-Add-compass-command.patch diff --git a/patches/server/0010-Purpur-Implement-ram-and-rambar-commands.patch b/patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch similarity index 100% rename from patches/server/0010-Purpur-Implement-ram-and-rambar-commands.patch rename to patches/server/0011-Purpur-Implement-ram-and-rambar-commands.patch diff --git a/patches/server/0011-Purpur-Lagging-threshold.patch b/patches/server/0012-Purpur-Lagging-threshold.patch similarity index 96% rename from patches/server/0011-Purpur-Lagging-threshold.patch rename to patches/server/0012-Purpur-Lagging-threshold.patch index 515e666f..15883ff5 100644 --- a/patches/server/0011-Purpur-Lagging-threshold.patch +++ b/patches/server/0012-Purpur-Lagging-threshold.patch @@ -27,7 +27,7 @@ index ab0a4a36241bee59b142df65736003c69dcb3dd4..411fae7132b1d1763712594a18cff10d } // Spigot end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 07b40f503358987339937bb8db5a3ee54c1b08c8..faff1f560eef2429621b4b0a4d760f9a558dcb73 100644 +index dde6e4d4f64792e8815eb302fda49b6afa0030a1..96cde1f86ca073e7e9e5799bcb12a10adf9230b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2943,4 +2943,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0012-Purpur-Configurable-TPS-Catchup.patch b/patches/server/0013-Purpur-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0012-Purpur-Configurable-TPS-Catchup.patch rename to patches/server/0013-Purpur-Configurable-TPS-Catchup.patch diff --git a/patches/server/0013-Purpur-Add-allow-water-in-end-world-option.patch b/patches/server/0014-Purpur-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0013-Purpur-Add-allow-water-in-end-world-option.patch rename to patches/server/0014-Purpur-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0014-Purpur-Configurable-sponge-absorption.patch b/patches/server/0015-Purpur-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0014-Purpur-Configurable-sponge-absorption.patch rename to patches/server/0015-Purpur-Configurable-sponge-absorption.patch diff --git a/patches/server/0015-Purpur-Configurable-piston-push-limit.patch b/patches/server/0016-Purpur-Configurable-piston-push-limit.patch similarity index 100% rename from patches/server/0015-Purpur-Configurable-piston-push-limit.patch rename to patches/server/0016-Purpur-Configurable-piston-push-limit.patch diff --git a/patches/server/0016-Purpur-Configurable-broadcast-settings.patch b/patches/server/0017-Purpur-Configurable-broadcast-settings.patch similarity index 100% rename from patches/server/0016-Purpur-Configurable-broadcast-settings.patch rename to patches/server/0017-Purpur-Configurable-broadcast-settings.patch diff --git a/patches/server/0017-Purpur-Allow-player-join-full-server-by-permission.patch b/patches/server/0018-Purpur-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0017-Purpur-Allow-player-join-full-server-by-permission.patch rename to patches/server/0018-Purpur-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0018-Purpur-Halloween-options-and-optimizations.patch b/patches/server/0019-Purpur-Halloween-options-and-optimizations.patch similarity index 100% rename from patches/server/0018-Purpur-Halloween-options-and-optimizations.patch rename to patches/server/0019-Purpur-Halloween-options-and-optimizations.patch diff --git a/patches/server/0019-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0020-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch similarity index 100% rename from patches/server/0019-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch rename to patches/server/0020-Purpur-Persistent-BlockEntity-Lore-and-DisplayName.patch diff --git a/patches/server/0020-Purpur-Add-more-logger-output-for-invalid-movement-k.patch b/patches/server/0021-Purpur-Add-more-logger-output-for-invalid-movement-k.patch similarity index 100% rename from patches/server/0020-Purpur-Add-more-logger-output-for-invalid-movement-k.patch rename to patches/server/0021-Purpur-Add-more-logger-output-for-invalid-movement-k.patch diff --git a/patches/server/0021-Purpur-Log-skipped-entity-s-position.patch b/patches/server/0022-Purpur-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0021-Purpur-Log-skipped-entity-s-position.patch rename to patches/server/0022-Purpur-Log-skipped-entity-s-position.patch diff --git a/patches/server/0022-Purpur-Alternative-Keepalive-Handling.patch b/patches/server/0023-Purpur-Alternative-Keepalive-Handling.patch similarity index 100% rename from patches/server/0022-Purpur-Alternative-Keepalive-Handling.patch rename to patches/server/0023-Purpur-Alternative-Keepalive-Handling.patch diff --git a/patches/server/0023-Purpur-Skip-events-if-there-s-no-listeners.patch b/patches/server/0024-Purpur-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0023-Purpur-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0024-Purpur-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0024-Purpur-Add-toggle-for-sand-duping-fix.patch b/patches/server/0025-Purpur-Add-toggle-for-sand-duping-fix.patch similarity index 100% rename from patches/server/0024-Purpur-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0025-Purpur-Add-toggle-for-sand-duping-fix.patch diff --git a/patches/server/0025-Purpur-Lobotomize-stuck-villagers.patch b/patches/server/0026-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0025-Purpur-Lobotomize-stuck-villagers.patch rename to patches/server/0026-Purpur-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0026-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0027-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 100% rename from patches/server/0026-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0027-Purpur-Option-to-disable-kick-for-out-of-order-chat.patch diff --git a/patches/server/0027-Purpur-Remove-Timings.patch b/patches/server/0028-Purpur-Remove-Timings.patch similarity index 100% rename from patches/server/0027-Purpur-Remove-Timings.patch rename to patches/server/0028-Purpur-Remove-Timings.patch diff --git a/patches/server/0028-Purpur-Remove-Mojang-Profiler.patch b/patches/server/0029-Purpur-Remove-Mojang-Profiler.patch similarity index 99% rename from patches/server/0028-Purpur-Remove-Mojang-Profiler.patch rename to patches/server/0029-Purpur-Remove-Mojang-Profiler.patch index 5fd50ad5..ce8b75c6 100644 --- a/patches/server/0028-Purpur-Remove-Mojang-Profiler.patch +++ b/patches/server/0029-Purpur-Remove-Mojang-Profiler.patch @@ -1572,7 +1572,7 @@ index 0f365b9dbb160d90ddf5fcd40895305df48ce916..afb46f8a7d6a960529286c51aa3b21e0 } diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java -index 5956a7759964f5e4939f062e93714fba64f53141..c03cbeb09d43b24e87d592de31d371b09dbf2982 100644 +index 0ca82175ec91ca8b3418c0931682c972666c47f8..8a53e2fe5821393a905a75b5f18f7101c43d92dd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java @@ -198,9 +198,9 @@ public class Zoglin extends Monster implements Enemy, HoglinBase { @@ -1622,7 +1622,7 @@ index b401fb4f276ca81b4bb18426ee56abed8a9f7a7b..5349361f1b8af4434a9dd75e5401264a super.customServerAiStep(); } diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java -index ac75c54e897565e340b66823caeed92ba1d1641a..06e5dc592a3dd23d52fd727a477c2262804054ef 100644 +index 769e4fbaac01a4fe3a45bd9cab5c63b61fc69f53..3aa20d9dfd887d3ffa3c243bbe6bf3217b0ccd1f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java @@ -85,9 +85,9 @@ public class PiglinBrute extends AbstractPiglin { diff --git a/patches/server/0029-KeYi-Do-not-save-firework-entities-or-the-server-may.patch b/patches/server/0030-KeYi-Do-not-save-firework-entities-or-the-server-may.patch similarity index 100% rename from patches/server/0029-KeYi-Do-not-save-firework-entities-or-the-server-may.patch rename to patches/server/0030-KeYi-Do-not-save-firework-entities-or-the-server-may.patch diff --git a/patches/server/0030-KeYi-Use-a-faster-random-implementation.patch b/patches/server/0031-KeYi-Use-a-faster-random-implementation.patch similarity index 100% rename from patches/server/0030-KeYi-Use-a-faster-random-implementation.patch rename to patches/server/0031-KeYi-Use-a-faster-random-implementation.patch diff --git a/patches/server/0031-KeYi-Player-Skull-API.patch b/patches/server/0032-KeYi-Player-Skull-API.patch similarity index 100% rename from patches/server/0031-KeYi-Player-Skull-API.patch rename to patches/server/0032-KeYi-Player-Skull-API.patch diff --git a/patches/server/0032-Carpet-Fixes-Optimized-getBiome-method.patch b/patches/server/0033-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from patches/server/0032-Carpet-Fixes-Optimized-getBiome-method.patch rename to patches/server/0033-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/patches/server/0033-Carpet-Fixes-Use-optimized-RecipeManager.patch b/patches/server/0034-Carpet-Fixes-Use-optimized-RecipeManager.patch similarity index 100% rename from patches/server/0033-Carpet-Fixes-Use-optimized-RecipeManager.patch rename to patches/server/0034-Carpet-Fixes-Use-optimized-RecipeManager.patch diff --git a/patches/server/0034-Patina-Don-t-create-new-random-instance.patch b/patches/server/0035-Patina-Don-t-create-new-random-instance.patch similarity index 100% rename from patches/server/0034-Patina-Don-t-create-new-random-instance.patch rename to patches/server/0035-Patina-Don-t-create-new-random-instance.patch diff --git a/patches/server/0035-Yatopia-Smarter-statistics-ticking.patch b/patches/server/0036-Yatopia-Smarter-statistics-ticking.patch similarity index 100% rename from patches/server/0035-Yatopia-Smarter-statistics-ticking.patch rename to patches/server/0036-Yatopia-Smarter-statistics-ticking.patch diff --git a/patches/server/0036-Mirai-Fast-speed-check.patch b/patches/server/0037-Mirai-Fast-speed-check.patch similarity index 100% rename from patches/server/0036-Mirai-Fast-speed-check.patch rename to patches/server/0037-Mirai-Fast-speed-check.patch diff --git a/patches/server/0037-VMP-Skip-entity-move-if-no-movement.patch b/patches/server/0038-VMP-Skip-entity-move-if-no-movement.patch similarity index 100% rename from patches/server/0037-VMP-Skip-entity-move-if-no-movement.patch rename to patches/server/0038-VMP-Skip-entity-move-if-no-movement.patch diff --git a/patches/server/0038-Petal-Reduce-sensor-work.patch b/patches/server/0039-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0038-Petal-Reduce-sensor-work.patch rename to patches/server/0039-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0039-Hearse-Async-entity-traveling.patch b/patches/server/0040-Hearse-Async-entity-traveling.patch similarity index 100% rename from patches/server/0039-Hearse-Async-entity-traveling.patch rename to patches/server/0040-Hearse-Async-entity-traveling.patch diff --git a/patches/server/0040-Hearse-Async-entity-ai.patch b/patches/server/0041-Hearse-Async-entity-ai.patch similarity index 100% rename from patches/server/0040-Hearse-Async-entity-ai.patch rename to patches/server/0041-Hearse-Async-entity-ai.patch diff --git a/patches/server/0041-Hearse-Pathfinding-Fixes.patch b/patches/server/0042-Hearse-Pathfinding-Fixes.patch similarity index 100% rename from patches/server/0041-Hearse-Pathfinding-Fixes.patch rename to patches/server/0042-Hearse-Pathfinding-Fixes.patch