From 2951510ea1139060b26d06b67d1d0f30b4c83626 Mon Sep 17 00:00:00 2001 From: granny Date: Tue, 3 Dec 2024 21:14:29 -0800 Subject: [PATCH] all patches applied \o/ --- ...re-logger-output-for-invalid-movement-kicks.patch | 6 +++--- .../0252-Add-Bee-API.patch | 8 ++++---- .../0253-Debug-Marker-API.patch | 6 +++--- ...-spawning-option-to-ignore-creative-players.patch | 0 .../0255-Add-skeleton-bow-accuracy-option.patch | 4 ++-- .../0256-Add-death-screen-API.patch | 4 ++-- .../0257-Make-pufferfish-config-relocatable.patch | 2 +- .../0258-Implement-ram-and-rambar-commands.patch | 10 +++++----- .../0259-Configurable-block-blast-resistance.patch | 2 +- ...60-Configurable-block-fall-damage-modifiers.patch | 4 ++-- .../0261-Language-API.patch | 0 .../0262-Milk-Keeps-Beneficial-Effects.patch | 2 +- ...-Fix-mobs-not-looking-up-and-down-when-stra.patch | 0 .../0264-Add-log-suppression-for-LibraryLoader.patch | 0 ...an-option-to-fix-MC-3304-projectile-looting.patch | 10 +++++----- ...n-to-allow-creeper-to-encircle-target-when-.patch | 0 .../0267-Fire-Immunity-API.patch | 10 +++++----- ...n-to-teleport-to-spawn-on-nether-ceiling-da.patch | 4 ++-- .../0269-Added-got-ram-event.patch | 0 .../0270-Log-skipped-entity-s-position.patch | 4 ++-- .../0271-End-Crystal-Cramming.patch | 0 ...-allow-beacon-effects-when-covered-by-tinte.patch | 0 ...d-attribute-clamping-and-armor-limit-config.patch | 0 ...274-Config-to-remove-explosion-radius-clamp.patch | 2 +- ...onemealable-sugarcane-cactus-and-netherwart.patch | 2 +- .../0276-Add-PreExplodeEvents.patch | 2 +- .../0277-Improve-output-of-plugins-command.patch | 0 .../0278-Make-GUI-Great-Again.patch | 0 .../0279-Stored-Bee-API.patch | 4 ++-- .../0280-Shears-can-defuse-TNT.patch | 2 +- .../0281-Explorer-Map-API.patch | 2 +- .../0282-Option-Ocelot-Spawn-Under-Sea-Level.patch | 0 ...tion-for-piglins-to-ignore-gold-trimmed-arm.patch | 0 ...n-for-always-showing-item-in-player-death-m.patch | 0 .../0285-place-end-crystal-on-any-block.patch | 0 ...n-to-disable-the-copper-oxidation-proximity.patch | 0 .../0287-register-minecraft-debug-commands.patch | 4 ++-- .../0288-Configurable-villager-search-radius.patch | 12 ++++++------ ...9-option-to-make-ravagers-afraid-of-rabbits.patch | 6 +++--- .../0290-config-for-startup-commands.patch | 4 ++-- .../0291-Config-to-reverse-bubble-column-flow.patch | 0 .../0292-Adopt-MaterialRerouting.patch | 0 ...tyTeleportHinderedEvent-when-attempting-to-.patch | 2 +- .../0294-ItemStack-convenience-methods.patch | 0 44 files changed, 59 insertions(+), 59 deletions(-) rename patches/{unapplied-server => server}/0251-Add-more-logger-output-for-invalid-movement-kicks.patch (92%) rename patches/{unapplied-server => server}/0252-Add-Bee-API.patch (88%) rename patches/{unapplied-server => server}/0253-Debug-Marker-API.patch (96%) rename patches/{unapplied-server => server}/0254-mob-spawning-option-to-ignore-creative-players.patch (100%) rename patches/{unapplied-server => server}/0255-Add-skeleton-bow-accuracy-option.patch (95%) rename patches/{unapplied-server => server}/0256-Add-death-screen-API.patch (87%) rename patches/{unapplied-server => server}/0257-Make-pufferfish-config-relocatable.patch (96%) rename patches/{unapplied-server => server}/0258-Implement-ram-and-rambar-commands.patch (98%) rename patches/{unapplied-server => server}/0259-Configurable-block-blast-resistance.patch (96%) rename patches/{unapplied-server => server}/0260-Configurable-block-fall-damage-modifiers.patch (97%) rename patches/{unapplied-server => server}/0261-Language-API.patch (100%) rename patches/{unapplied-server => server}/0262-Milk-Keeps-Beneficial-Effects.patch (97%) rename patches/{unapplied-server => server}/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch (100%) rename patches/{unapplied-server => server}/0264-Add-log-suppression-for-LibraryLoader.patch (100%) rename patches/{unapplied-server => server}/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch (93%) rename patches/{unapplied-server => server}/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch (100%) rename patches/{unapplied-server => server}/0267-Fire-Immunity-API.patch (91%) rename patches/{unapplied-server => server}/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch (94%) rename patches/{unapplied-server => server}/0269-Added-got-ram-event.patch (100%) rename patches/{unapplied-server => server}/0270-Log-skipped-entity-s-position.patch (86%) rename patches/{unapplied-server => server}/0271-End-Crystal-Cramming.patch (100%) rename patches/{unapplied-server => server}/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch (100%) rename patches/{unapplied-server => server}/0273-Add-attribute-clamping-and-armor-limit-config.patch (100%) rename patches/{unapplied-server => server}/0274-Config-to-remove-explosion-radius-clamp.patch (96%) rename patches/{unapplied-server => server}/0275-bonemealable-sugarcane-cactus-and-netherwart.patch (98%) rename patches/{unapplied-server => server}/0276-Add-PreExplodeEvents.patch (95%) rename patches/{unapplied-server => server}/0277-Improve-output-of-plugins-command.patch (100%) rename patches/{unapplied-server => server}/0278-Make-GUI-Great-Again.patch (100%) rename patches/{unapplied-server => server}/0279-Stored-Bee-API.patch (98%) rename patches/{unapplied-server => server}/0280-Shears-can-defuse-TNT.patch (97%) rename patches/{unapplied-server => server}/0281-Explorer-Map-API.patch (96%) rename patches/{unapplied-server => server}/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch (100%) rename patches/{unapplied-server => server}/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch (100%) rename patches/{unapplied-server => server}/0284-Add-option-for-always-showing-item-in-player-death-m.patch (100%) rename patches/{unapplied-server => server}/0285-place-end-crystal-on-any-block.patch (100%) rename patches/{unapplied-server => server}/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch (100%) rename patches/{unapplied-server => server}/0287-register-minecraft-debug-commands.patch (95%) rename patches/{unapplied-server => server}/0288-Configurable-villager-search-radius.patch (87%) rename patches/{unapplied-server => server}/0289-option-to-make-ravagers-afraid-of-rabbits.patch (90%) rename patches/{unapplied-server => server}/0290-config-for-startup-commands.patch (93%) rename patches/{unapplied-server => server}/0291-Config-to-reverse-bubble-column-flow.patch (100%) rename patches/{unapplied-server => server}/0292-Adopt-MaterialRerouting.patch (100%) rename patches/{unapplied-server => server}/0293-Fire-EntityTeleportHinderedEvent-when-attempting-to-.patch (91%) rename patches/{unapplied-server => server}/0294-ItemStack-convenience-methods.patch (100%) diff --git a/patches/unapplied-server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 92% rename from patches/unapplied-server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch index eeec00f5d..977351c71 100644 --- a/patches/unapplied-server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch +++ b/patches/server/0251-Add-more-logger-output-for-invalid-movement-kicks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add more logger output for invalid movement kicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1e1b42f60679c8b8b27b3255feda4c6cf77d5536..9ae16e24013ea5664d4ea6d52ed7dd188404890f 100644 +index 3c98be45587f3f6ca6cdc53834ef7dae4962f58d..f8438bc2af43ee8883db75503deac10e1e34686e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -761,6 +761,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -756,6 +756,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); if (packet.getId() == this.awaitingTeleport) { if (this.awaitingPositionFromClient == null) { @@ -16,7 +16,7 @@ index 1e1b42f60679c8b8b27b3255feda4c6cf77d5536..9ae16e24013ea5664d4ea6d52ed7dd18 this.disconnect((Component) Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause return; } -@@ -1372,7 +1373,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -1425,7 +1426,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @Override public void handleMovePlayer(ServerboundMovePlayerPacket packet) { PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); diff --git a/patches/unapplied-server/0252-Add-Bee-API.patch b/patches/server/0252-Add-Bee-API.patch similarity index 88% rename from patches/unapplied-server/0252-Add-Bee-API.patch rename to patches/server/0252-Add-Bee-API.patch index e4abbb113..6a1940d10 100644 --- a/patches/unapplied-server/0252-Add-Bee-API.patch +++ b/patches/server/0252-Add-Bee-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Bee API diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 4b32a783cabf05f5bae0dba22eea8ac7ba2cd285..dc8df0912c1d18176e18a8f4dc43c4f60f81b659 100644 +index 5ca5f128e5614146e76935e6d674e0699c65dfdb..884527c8326c6df3656a4d3a2f5f2847f95b0f63 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java -@@ -954,6 +954,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -988,6 +988,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { if (optional.isPresent()) { Bee.this.savedFlowerPos = (BlockPos) optional.get(); Bee.this.navigation.moveTo((double) Bee.this.savedFlowerPos.getX() + 0.5D, (double) Bee.this.savedFlowerPos.getY() + 0.5D, (double) Bee.this.savedFlowerPos.getZ() + 0.5D, 1.2000000476837158D); @@ -16,7 +16,7 @@ index 4b32a783cabf05f5bae0dba22eea8ac7ba2cd285..dc8df0912c1d18176e18a8f4dc43c4f6 return true; } else { Bee.this.remainingCooldownBeforeLocatingNewFlower = Mth.nextInt(Bee.this.random, 20, 60); -@@ -997,6 +998,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1031,6 +1032,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { this.pollinating = false; Bee.this.navigation.stop(); Bee.this.remainingCooldownBeforeLocatingNewFlower = 200; @@ -24,7 +24,7 @@ index 4b32a783cabf05f5bae0dba22eea8ac7ba2cd285..dc8df0912c1d18176e18a8f4dc43c4f6 } @Override -@@ -1046,6 +1048,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { +@@ -1080,6 +1082,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { this.setWantedPos(); } diff --git a/patches/unapplied-server/0253-Debug-Marker-API.patch b/patches/server/0253-Debug-Marker-API.patch similarity index 96% rename from patches/unapplied-server/0253-Debug-Marker-API.patch rename to patches/server/0253-Debug-Marker-API.patch index e6141684a..e4d7f5de6 100644 --- a/patches/unapplied-server/0253-Debug-Marker-API.patch +++ b/patches/server/0253-Debug-Marker-API.patch @@ -52,7 +52,7 @@ index 268ab3f175ece52e7da6dfa50573089f49685d68..6b0308d081af880a79c369306e8ad697 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 868bf852a9ed6ea2a48a238608f47405da1296f4..907fe00ab752ad124020755f211567af771b9d70 100644 +index 5d0f4395617bcd59aad7cea221f6009d08dc0913..41077511328a31f39639af1d02e7a3041992676d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2388,6 +2388,42 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -99,10 +99,10 @@ index 868bf852a9ed6ea2a48a238608f47405da1296f4..907fe00ab752ad124020755f211567af @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fa0cc92b6c66cbed3ab895278b4bf3f80b0af69d..5bb5b1eaf7f50983bce3e9f515115eced685527a 100644 +index 3c76dd383ec0ba19eea19d12902833dc410f96c0..f63b02573b3d42ae8743f591aff2282ece927e31 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3629,5 +3629,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3614,5 +3614,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/unapplied-server/0254-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0254-mob-spawning-option-to-ignore-creative-players.patch similarity index 100% rename from patches/unapplied-server/0254-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0254-mob-spawning-option-to-ignore-creative-players.patch diff --git a/patches/unapplied-server/0255-Add-skeleton-bow-accuracy-option.patch b/patches/server/0255-Add-skeleton-bow-accuracy-option.patch similarity index 95% rename from patches/unapplied-server/0255-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0255-Add-skeleton-bow-accuracy-option.patch index bc59e9a17..9a261e965 100644 --- a/patches/unapplied-server/0255-Add-skeleton-bow-accuracy-option.patch +++ b/patches/server/0255-Add-skeleton-bow-accuracy-option.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add skeleton bow accuracy option diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index 2cadbc0d56908ca978e1735eff07f5e634548606..39d02cf0e31832e30c4f034b0b5385e3e0057e60 100644 +index f90f3e3ad7c941e3222a8119d9b01d571eef4c1b..0235488faee8078186fbb78038789da0846aca29 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -@@ -197,7 +197,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo +@@ -199,7 +199,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo } if (event.getProjectile() == entityarrow.getBukkitEntity()) { diff --git a/patches/unapplied-server/0256-Add-death-screen-API.patch b/patches/server/0256-Add-death-screen-API.patch similarity index 87% rename from patches/unapplied-server/0256-Add-death-screen-API.patch rename to patches/server/0256-Add-death-screen-API.patch index 22e53757c..cfae288b3 100644 --- a/patches/unapplied-server/0256-Add-death-screen-API.patch +++ b/patches/server/0256-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 674df8d09988b2509adf93d75b2b37009a709410..02339cdd1e8cd6496cb466eb4b1c7ce2d9b6f064 100644 +index f63b02573b3d42ae8743f591aff2282ece927e31..8e0136c55e37d1f2732c555eb7c6129eb2b84c19 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3667,5 +3667,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3652,5 +3652,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (this.getHandle().connection == null) return; this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(new net.minecraft.network.protocol.common.custom.GameTestClearMarkersDebugPayload())); } diff --git a/patches/unapplied-server/0257-Make-pufferfish-config-relocatable.patch b/patches/server/0257-Make-pufferfish-config-relocatable.patch similarity index 96% rename from patches/unapplied-server/0257-Make-pufferfish-config-relocatable.patch rename to patches/server/0257-Make-pufferfish-config-relocatable.patch index 4b22dded7..f89e6e654 100644 --- a/patches/unapplied-server/0257-Make-pufferfish-config-relocatable.patch +++ b/patches/server/0257-Make-pufferfish-config-relocatable.patch @@ -38,7 +38,7 @@ index 8eb51119d60979f85bc98a9413d318522c732693..08a81a45371fd273fb35956bef3bb794 gg.pufferfish.pufferfish.PufferfishCommand.init(); // Pufferfish diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5bce26e9671aab15ac4bac9a0d00b5184bef74ea..430407b0cf06ba337c59cd576c7e40a8e5fe8229 100644 +index 628f7f784c830189c5718a20ce43a9352e400c33..c471a8c81ba067abcb22956ad1a30b5a9b64fc87 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -182,6 +182,12 @@ public class Main { diff --git a/patches/unapplied-server/0258-Implement-ram-and-rambar-commands.patch b/patches/server/0258-Implement-ram-and-rambar-commands.patch similarity index 98% rename from patches/unapplied-server/0258-Implement-ram-and-rambar-commands.patch rename to patches/server/0258-Implement-ram-and-rambar-commands.patch index bd842583a..1fde2f28a 100644 --- a/patches/unapplied-server/0258-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0258-Implement-ram-and-rambar-commands.patch @@ -18,10 +18,10 @@ index eedb3707523b47ab79db326f6d7382cca60c5393..db455a0fc7e1fc004215b718ff470bd2 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 323d474582cf796ae9d40f9d00f277496d3f2c0a..e6001fadc04b63b82e20652bbb16cb1db5cf44bd 100644 +index 7e785394de3db56e5d0fd8bea5edf5df9fa129fa..8264adc43edfebc2c260c2b915186c20ec3637cc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -332,6 +332,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -330,6 +330,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple public boolean purpurClient = false; // Purpur private boolean tpsBar = false; // Purpur private boolean compassBar = false; // Purpur @@ -29,7 +29,7 @@ index 323d474582cf796ae9d40f9d00f277496d3f2c0a..e6001fadc04b63b82e20652bbb16cb1d // Paper start - rewrite chunk system private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; -@@ -696,6 +697,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -694,6 +695,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple if (nbt.contains("Purpur.TPSBar")) { this.tpsBar = nbt.getBoolean("Purpur.TPSBar"); } // Purpur if (nbt.contains("Purpur.CompassBar")) { this.compassBar = nbt.getBoolean("Purpur.CompassBar"); } // Purpur @@ -37,7 +37,7 @@ index 323d474582cf796ae9d40f9d00f277496d3f2c0a..e6001fadc04b63b82e20652bbb16cb1d } @Override -@@ -748,6 +750,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -746,6 +748,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple } this.saveEnderPearls(nbt); @@ -45,7 +45,7 @@ index 323d474582cf796ae9d40f9d00f277496d3f2c0a..e6001fadc04b63b82e20652bbb16cb1d nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur } -@@ -3477,5 +3480,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple +@@ -3457,5 +3460,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple public void compassBar(boolean compassBar) { this.compassBar = compassBar; } diff --git a/patches/unapplied-server/0259-Configurable-block-blast-resistance.patch b/patches/server/0259-Configurable-block-blast-resistance.patch similarity index 96% rename from patches/unapplied-server/0259-Configurable-block-blast-resistance.patch rename to patches/server/0259-Configurable-block-blast-resistance.patch index 632aa1f53..96209afe8 100644 --- a/patches/unapplied-server/0259-Configurable-block-blast-resistance.patch +++ b/patches/server/0259-Configurable-block-blast-resistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable block blast resistance diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 6b987ee220d94b482d2aeb4ff6bf271853605dc1..852bfe68ab722a5cbdd90dbd70501b751fe81a78 100644 +index 6376b8b3ff444f4cab93e2bb5d2becc77c33c118..c8ae6e4cd74549f753ec04def5d882de1ab72308 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -91,7 +91,7 @@ public abstract class BlockBehaviour implements FeatureElement { diff --git a/patches/unapplied-server/0260-Configurable-block-fall-damage-modifiers.patch b/patches/server/0260-Configurable-block-fall-damage-modifiers.patch similarity index 97% rename from patches/unapplied-server/0260-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0260-Configurable-block-fall-damage-modifiers.patch index fc1e59e3e..6a92ca4e0 100644 --- a/patches/unapplied-server/0260-Configurable-block-fall-damage-modifiers.patch +++ b/patches/server/0260-Configurable-block-fall-damage-modifiers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable block fall damage modifiers diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java -index 3b19395f2ddee654a77df5738a1942a08c20c179..c130d316e87f1f896d33ab43831063a89e3bef2b 100644 +index db79ef24ea01db5f619ab29700d3d391438fb742..54836f2a1e4cc9046ba29fb71ea237b358c9cb7d 100644 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java @@ -183,7 +183,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock @@ -18,7 +18,7 @@ index 3b19395f2ddee654a77df5738a1942a08c20c179..c130d316e87f1f896d33ab43831063a8 @Override diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index d324eefa500c528776df698e7f9dcdeab76da167..1748aea6613e0c8081f70092c9431e7e04907383 100644 +index b0fbadd0d6ec3e34e36c9f33ed89a3c315dc4289..91e68335d7007e3c1fe13eec0060db01c5f659ac 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -88,6 +88,10 @@ public class Block extends BlockBehaviour implements ItemLike { diff --git a/patches/unapplied-server/0261-Language-API.patch b/patches/server/0261-Language-API.patch similarity index 100% rename from patches/unapplied-server/0261-Language-API.patch rename to patches/server/0261-Language-API.patch diff --git a/patches/unapplied-server/0262-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0262-Milk-Keeps-Beneficial-Effects.patch similarity index 97% rename from patches/unapplied-server/0262-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0262-Milk-Keeps-Beneficial-Effects.patch index 854e0a880..2bc2f25ed 100644 --- a/patches/unapplied-server/0262-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0262-Milk-Keeps-Beneficial-Effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 71f735d2c91d08ab652ddc8f3fe37bbb3b425ba4..f4604e543a980d6aeb485252da5a4e755aa12bfa 100644 +index 239046ab467f499107d1e30ca183d79661a380f0..33fbe0f7a356dd847e546feffb468b2803c6744b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1162,6 +1162,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/unapplied-server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/unapplied-server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0263-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/unapplied-server/0264-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0264-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/unapplied-server/0264-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0264-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/unapplied-server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 93% rename from patches/unapplied-server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch index 62b9e1c03..5370b128d 100644 --- a/patches/unapplied-server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch +++ b/patches/server/0265-Add-an-option-to-fix-MC-3304-projectile-looting.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add an option to fix MC-3304 (projectile looting) diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index b7dccbf33feb978b3937522bb0d62d154699ae9f..d8b69ed256c18e264cffc0097936029e5bd33dd8 100644 +index f4f2581faba3f8686592f3f8ebbcdba3e5d30f7b..2f56d25fe4dce613f078455bd0150c6140df7fff 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -80,6 +80,7 @@ public abstract class AbstractArrow extends Projectile { +@@ -82,6 +82,7 @@ public abstract class AbstractArrow extends Projectile { public ItemStack pickupItemStack; @Nullable public ItemStack firedFromWeapon; @@ -16,7 +16,7 @@ index b7dccbf33feb978b3937522bb0d62d154699ae9f..d8b69ed256c18e264cffc0097936029e // Spigot Start @Override -@@ -623,6 +624,12 @@ public abstract class AbstractArrow extends Projectile { +@@ -638,6 +639,12 @@ public abstract class AbstractArrow extends Projectile { return this.firedFromWeapon; } @@ -43,10 +43,10 @@ index 78ba170a83f8c026bd110eae494c52577182ed61..c2ae50872cead7202246b9cce4db6e0a } diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java -index 9134c4aada4e0cd7b51810a59405c07d433f7c78..23e04d0d68ffa0e07ab295e7121f8a4963f4914a 100644 +index 810082126567eb02bec395065b95b3c3902d4973..be32255c9bd90f7de3f8f5a62d84c7dcf59fa722 100644 --- a/src/main/java/net/minecraft/world/item/TridentItem.java +++ b/src/main/java/net/minecraft/world/item/TridentItem.java -@@ -100,6 +100,9 @@ public class TridentItem extends Item implements ProjectileItem { +@@ -101,6 +101,9 @@ public class TridentItem extends Item implements ProjectileItem { return false; } ThrownTrident entitythrowntrident = tridentDelayed.projectile(); // Paper - PlayerLaunchProjectileEvent diff --git a/patches/unapplied-server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/unapplied-server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/unapplied-server/0267-Fire-Immunity-API.patch b/patches/server/0267-Fire-Immunity-API.patch similarity index 91% rename from patches/unapplied-server/0267-Fire-Immunity-API.patch rename to patches/server/0267-Fire-Immunity-API.patch index cff36eb81..3f639b2ea 100644 --- a/patches/unapplied-server/0267-Fire-Immunity-API.patch +++ b/patches/server/0267-Fire-Immunity-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2b612bfe6da7cc6d6447c60aa6f4b72b2616b72d..193c888d0ff2a8c2ef1a7fc8fd8af5d26e701092 100644 +index 7435ff1996e0a6db2f98f1218bf7d2b73a3e2b1d..1832f7ef8a14fb60e004cb7b99a0cd0155332349 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -393,6 +393,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -16,7 +16,7 @@ index 2b612bfe6da7cc6d6447c60aa6f4b72b2616b72d..193c888d0ff2a8c2ef1a7fc8fd8af5d2 public void setOrigin(@javax.annotation.Nonnull Location location) { this.origin = location.toVector(); -@@ -1960,7 +1961,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1983,7 +1984,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } public boolean fireImmune() { @@ -25,7 +25,7 @@ index 2b612bfe6da7cc6d6447c60aa6f4b72b2616b72d..193c888d0ff2a8c2ef1a7fc8fd8af5d2 } public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { -@@ -2715,6 +2716,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2738,6 +2739,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess nbttagcompound.putBoolean("Paper.FreezeLock", true); } // Paper end @@ -37,7 +37,7 @@ index 2b612bfe6da7cc6d6447c60aa6f4b72b2616b72d..193c888d0ff2a8c2ef1a7fc8fd8af5d2 return nbttagcompound; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -2863,6 +2869,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2888,6 +2894,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess freezeLocked = nbt.getBoolean("Paper.FreezeLock"); } // Paper end @@ -50,7 +50,7 @@ index 2b612bfe6da7cc6d6447c60aa6f4b72b2616b72d..193c888d0ff2a8c2ef1a7fc8fd8af5d2 } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT"); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 02b07d43364c7dec37f1d2adffe123a5b595f669..51aee9a468f4ebfa9672fd9ce84883cf080859e3 100644 +index d4396ece618c0fec437ed915ce07be3fb5f7dca9..1290c1587fe9e39d9350c1079ab27f3be0c6084f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -88,6 +88,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { diff --git a/patches/unapplied-server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 94% rename from patches/unapplied-server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch index 0cee4abec..6b287c490 100644 --- a/patches/unapplied-server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch +++ b/patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn on nether ceiling damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 193c888d0ff2a8c2ef1a7fc8fd8af5d26e701092..aa171a1afb9800e6ec84f6b4f1b28e44177752f7 100644 +index 1832f7ef8a14fb60e004cb7b99a0cd0155332349..da7ffdf85907c92fe6c4c6a5ebe571ef4666fcb8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1000,6 +1000,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -1004,6 +1004,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v) && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) { // Paper end - Configurable nether ceiling damage diff --git a/patches/unapplied-server/0269-Added-got-ram-event.patch b/patches/server/0269-Added-got-ram-event.patch similarity index 100% rename from patches/unapplied-server/0269-Added-got-ram-event.patch rename to patches/server/0269-Added-got-ram-event.patch diff --git a/patches/unapplied-server/0270-Log-skipped-entity-s-position.patch b/patches/server/0270-Log-skipped-entity-s-position.patch similarity index 86% rename from patches/unapplied-server/0270-Log-skipped-entity-s-position.patch rename to patches/server/0270-Log-skipped-entity-s-position.patch index a18c62cbf..c2cfa2ac9 100644 --- a/patches/unapplied-server/0270-Log-skipped-entity-s-position.patch +++ b/patches/server/0270-Log-skipped-entity-s-position.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Log skipped entity's position diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index 40ae00146381a9a1ec70ffae5c683b46c72c56ff..1d50b03246d114c6583815205eeacb7ac8549aec 100644 +index 2f08747612bd238f12c8d3dccb996118e7c34e33..a3ae5e663a0334eaa8ca6ce89c3088620a849bb9 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java -@@ -683,6 +683,12 @@ public class EntityType implements FeatureElement, EntityTypeT +@@ -693,6 +693,12 @@ public class EntityType implements FeatureElement, EntityTypeT entity.load(nbt); }, () -> { EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); diff --git a/patches/unapplied-server/0271-End-Crystal-Cramming.patch b/patches/server/0271-End-Crystal-Cramming.patch similarity index 100% rename from patches/unapplied-server/0271-End-Crystal-Cramming.patch rename to patches/server/0271-End-Crystal-Cramming.patch diff --git a/patches/unapplied-server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 100% rename from patches/unapplied-server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch diff --git a/patches/unapplied-server/0273-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/unapplied-server/0273-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/unapplied-server/0274-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch similarity index 96% rename from patches/unapplied-server/0274-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0274-Config-to-remove-explosion-radius-clamp.patch index cb419f62f..e78060dac 100644 --- a/patches/unapplied-server/0274-Config-to-remove-explosion-radius-clamp.patch +++ b/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to remove explosion radius clamp diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index bbbd451ff184be8fa13bd93d53c89a9502f9951a..913f7d5fd9823eea9fad2d4e6689511f8d0cfda6 100644 +index 685ccfb73bf7125585ef90b6a0f51b2f81daa428..15a3849922664b85fa6bc9101c2af380d57ea0f3 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -311,7 +311,7 @@ public class ServerExplosion implements Explosion { diff --git a/patches/unapplied-server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 98% rename from patches/unapplied-server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch index fa46c7cbb..a5d7b1bd9 100644 --- a/patches/unapplied-server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch +++ b/patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch @@ -53,7 +53,7 @@ index bbfd8f5d404d0add94f0d8ac89a2964692b37e44..9f163ed07f8e6a5370c4c355b4e910f7 + // Purpur end } diff --git a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java -index da1c7999ca64199387054de46489d3ff4a299289..b8355ea1de26c4b6905f477fb4e110f1762447b4 100644 +index b571bca4375ca7caf9b75dbf84009cb0604b66ad..264692baa4a20b66910d8ff379fa72acb99e27f8 100644 --- a/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java +++ b/src/main/java/net/minecraft/world/level/block/NetherWartBlock.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; diff --git a/patches/unapplied-server/0276-Add-PreExplodeEvents.patch b/patches/server/0276-Add-PreExplodeEvents.patch similarity index 95% rename from patches/unapplied-server/0276-Add-PreExplodeEvents.patch rename to patches/server/0276-Add-PreExplodeEvents.patch index e0195de0c..b73e69bc0 100644 --- a/patches/unapplied-server/0276-Add-PreExplodeEvents.patch +++ b/patches/server/0276-Add-PreExplodeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PreExplodeEvents diff --git a/src/main/java/net/minecraft/world/level/ServerExplosion.java b/src/main/java/net/minecraft/world/level/ServerExplosion.java -index 913f7d5fd9823eea9fad2d4e6689511f8d0cfda6..3c3d219c9339f64c23ec0b31783bf68a4423636c 100644 +index 15a3849922664b85fa6bc9101c2af380d57ea0f3..e2763ee67530074d8ec78fbff694eb84f5373de0 100644 --- a/src/main/java/net/minecraft/world/level/ServerExplosion.java +++ b/src/main/java/net/minecraft/world/level/ServerExplosion.java @@ -670,6 +670,23 @@ public class ServerExplosion implements Explosion { diff --git a/patches/unapplied-server/0277-Improve-output-of-plugins-command.patch b/patches/server/0277-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/unapplied-server/0277-Improve-output-of-plugins-command.patch rename to patches/server/0277-Improve-output-of-plugins-command.patch diff --git a/patches/unapplied-server/0278-Make-GUI-Great-Again.patch b/patches/server/0278-Make-GUI-Great-Again.patch similarity index 100% rename from patches/unapplied-server/0278-Make-GUI-Great-Again.patch rename to patches/server/0278-Make-GUI-Great-Again.patch diff --git a/patches/unapplied-server/0279-Stored-Bee-API.patch b/patches/server/0279-Stored-Bee-API.patch similarity index 98% rename from patches/unapplied-server/0279-Stored-Bee-API.patch rename to patches/server/0279-Stored-Bee-API.patch index 02dbe502a..7da39c613 100644 --- a/patches/unapplied-server/0279-Stored-Bee-API.patch +++ b/patches/server/0279-Stored-Bee-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stored Bee API diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java -index b7ad467d7d7f50bcb90e50f00f905873e89c7956..def408384cbd571b7bee23f5cecf430a5d690c4b 100644 +index 7f0e37e23ff4c64355fdc822c0ac683959b8588a..6fa25cac9d88808a590281bf90f619fa2f167d4a 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java @@ -147,11 +147,33 @@ public class BeehiveBlockEntity extends BlockEntity { @@ -42,7 +42,7 @@ index b7ad467d7d7f50bcb90e50f00f905873e89c7956..def408384cbd571b7bee23f5cecf430a // Paper start - Add EntityBlockStorage clearEntities public void clearBees() { this.stored.clear(); -@@ -472,9 +494,9 @@ public class BeehiveBlockEntity extends BlockEntity { +@@ -467,9 +489,9 @@ public class BeehiveBlockEntity extends BlockEntity { } } diff --git a/patches/unapplied-server/0280-Shears-can-defuse-TNT.patch b/patches/server/0280-Shears-can-defuse-TNT.patch similarity index 97% rename from patches/unapplied-server/0280-Shears-can-defuse-TNT.patch rename to patches/server/0280-Shears-can-defuse-TNT.patch index f3c819cc2..1d2107b82 100644 --- a/patches/unapplied-server/0280-Shears-can-defuse-TNT.patch +++ b/patches/server/0280-Shears-can-defuse-TNT.patch @@ -8,7 +8,7 @@ Shears can now defuse TNT. Each world can have a configured chance for the TNT t By default the option is disabled to avoid breaking any possible vanilla mechanics. diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java -index de87483600e55d88176fe25db621bbd3e464729f..287ba483614e79e78022e703ef891f59f41ac455 100644 +index 809f5e847e2f5bb594c130cebd2cb897ea768d82..6f1e21d6c104d71fe4fc3376ed2f2273a5f3d3cc 100644 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java @@ -249,4 +249,31 @@ public class PrimedTnt extends Entity implements TraceableEntity { diff --git a/patches/unapplied-server/0281-Explorer-Map-API.patch b/patches/server/0281-Explorer-Map-API.patch similarity index 96% rename from patches/unapplied-server/0281-Explorer-Map-API.patch rename to patches/server/0281-Explorer-Map-API.patch index 27089456b..411627d30 100644 --- a/patches/unapplied-server/0281-Explorer-Map-API.patch +++ b/patches/server/0281-Explorer-Map-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Explorer Map API diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java -index 571f2540a1e9422025efe651167e26b44b437daa..c2f3c8b3d8eeb609b6d6067c4fb404aefbf94ec5 100644 +index 8ff50a4c7461bbd9f469d503f6b5ee482d2463d7..5c0a46c11003b6e154195a8ef299416cc73eae33 100644 --- a/src/main/java/net/minecraft/world/item/MapItem.java +++ b/src/main/java/net/minecraft/world/item/MapItem.java @@ -194,6 +194,7 @@ public class MapItem extends Item { diff --git a/patches/unapplied-server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 100% rename from patches/unapplied-server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0282-Option-Ocelot-Spawn-Under-Sea-Level.patch diff --git a/patches/unapplied-server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 100% rename from patches/unapplied-server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0283-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch diff --git a/patches/unapplied-server/0284-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 100% rename from patches/unapplied-server/0284-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0284-Add-option-for-always-showing-item-in-player-death-m.patch diff --git a/patches/unapplied-server/0285-place-end-crystal-on-any-block.patch b/patches/server/0285-place-end-crystal-on-any-block.patch similarity index 100% rename from patches/unapplied-server/0285-place-end-crystal-on-any-block.patch rename to patches/server/0285-place-end-crystal-on-any-block.patch diff --git a/patches/unapplied-server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 100% rename from patches/unapplied-server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0286-Add-option-to-disable-the-copper-oxidation-proximity.patch diff --git a/patches/unapplied-server/0287-register-minecraft-debug-commands.patch b/patches/server/0287-register-minecraft-debug-commands.patch similarity index 95% rename from patches/unapplied-server/0287-register-minecraft-debug-commands.patch rename to patches/server/0287-register-minecraft-debug-commands.patch index 21200a889..99c770e20 100644 --- a/patches/unapplied-server/0287-register-minecraft-debug-commands.patch +++ b/patches/server/0287-register-minecraft-debug-commands.patch @@ -20,10 +20,10 @@ index db455a0fc7e1fc004215b718ff470bd2f74eae1b..8d82425ccbc30b3f4a59767ca72bf373 DebugPathCommand.register(this.dispatcher); DebugMobSpawningCommand.register(this.dispatcher); diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 463eb4844e467c5c7018087e4f21d7d41e1c9063..ecaec3c7b5768771b00c4c33d48a76ba22653a79 100644 +index 978c0d7296f400fe2ebda89e4f61386e6e87fe0c..a880f4e5cf712654649ad043e58e073e9a87c0fe 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java -@@ -123,6 +123,7 @@ public class Main { +@@ -125,6 +125,7 @@ public class Main { // Purpur start - load config files early org.bukkit.configuration.file.YamlConfiguration purpurConfiguration = io.papermc.paper.configuration.PaperConfigurations.loadLegacyConfigFile((File) optionset.valueOf("purpur-settings")); org.purpurmc.purpur.PurpurConfig.clampEnchantLevels = purpurConfiguration.getBoolean("settings.enchantment.clamp-levels", true); diff --git a/patches/unapplied-server/0288-Configurable-villager-search-radius.patch b/patches/server/0288-Configurable-villager-search-radius.patch similarity index 87% rename from patches/unapplied-server/0288-Configurable-villager-search-radius.patch rename to patches/server/0288-Configurable-villager-search-radius.patch index 4fc65ed59..1e29bb581 100644 --- a/patches/unapplied-server/0288-Configurable-villager-search-radius.patch +++ b/patches/server/0288-Configurable-villager-search-radius.patch @@ -5,18 +5,18 @@ Subject: [PATCH] Configurable-villager-search-radius diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index e1b6fe9ecda25f86431baf414f1bfd3a26a8b2bd..3d7578605812021bc84b99d4db1672a682d897ad 100644 +index 0d177e828c2b338ce93c58aaef04df326e1eb0b2..273ba657926ce72a7c82861e880a82bf7f322a0b 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -@@ -73,7 +73,7 @@ public class AcquirePoi { +@@ -86,7 +86,7 @@ public class AcquirePoi { }; // Paper start - optimise POI access - java.util.List, BlockPos>> poiposes = new java.util.ArrayList<>(); + final java.util.List, BlockPos>> poiposes = new java.util.ArrayList<>(); - io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, poiPredicate, predicate2, entity.blockPosition(), 48, 48*48, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes); + io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, poiPredicate, predicate2, entity.blockPosition(), world.purpurConfig.villagerAcquirePoiSearchRadius, world.purpurConfig.villagerAcquirePoiSearchRadius*world.purpurConfig.villagerAcquirePoiSearchRadius, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes); - Set, BlockPos>> set = new java.util.HashSet<>(poiposes); - // Paper end - optimise POI access - Path path = findPathToPois(entity, set); + final Set, BlockPos>> set = new java.util.HashSet<>(poiposes.size()); + for (final Pair, BlockPos> poiPose : poiposes) { + if (worldPosBiPredicate.test(world, poiPose.getSecond())) { diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java index 92731b6b593289e9f583c9b705b219e81fcd8e73..9104d7010bda6f9f73b478c11490ef9c53f76da2 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java diff --git a/patches/unapplied-server/0289-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch similarity index 90% rename from patches/unapplied-server/0289-option-to-make-ravagers-afraid-of-rabbits.patch rename to patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch index ae28a292c..66b1f9b83 100644 --- a/patches/unapplied-server/0289-option-to-make-ravagers-afraid-of-rabbits.patch +++ b/patches/server/0289-option-to-make-ravagers-afraid-of-rabbits.patch @@ -6,13 +6,13 @@ Subject: [PATCH] option to make ravagers afraid of rabbits https://github.com/PurpurMC/Purpur/discussions/713 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -index 1c8cb19a8b25593d16518006247bdf0e71e16ab1..98c1934b4895a86cd8748edf906aaa721a87a123 100644 +index 5688f6ff0c1d9d1fbca548dcff8d8dfa5b42b8fd..17aaa3f376ce6183911739536206f9f701e452b5 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -@@ -122,6 +122,7 @@ public class Ravager extends Raider { +@@ -119,6 +119,7 @@ public class Ravager extends Raider { + super.registerGoals(); this.goalSelector.addGoal(0, new FloatGoal(this)); this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - this.goalSelector.addGoal(3, new AvoidEntityGoal<>(this, Creaking.class, 8.0F, 1.0D, 1.2D)); + if (level().purpurConfig.ravagerAvoidRabbits) this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.AvoidEntityGoal<>(this, net.minecraft.world.entity.animal.Rabbit.class, 6.0F, 1.0D, 1.2D)); // Purpur this.goalSelector.addGoal(4, new MeleeAttackGoal(this, 1.0D, true)); this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 0.4D)); diff --git a/patches/unapplied-server/0290-config-for-startup-commands.patch b/patches/server/0290-config-for-startup-commands.patch similarity index 93% rename from patches/unapplied-server/0290-config-for-startup-commands.patch rename to patches/server/0290-config-for-startup-commands.patch index 74f1ec8bd..ba7680bc4 100644 --- a/patches/unapplied-server/0290-config-for-startup-commands.patch +++ b/patches/server/0290-config-for-startup-commands.patch @@ -5,10 +5,10 @@ Subject: [PATCH] config for startup commands diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 284b96cd1e9eaad4600c820a504c12d953961019..23505b0f80d643d9ef569b49192f44e0373dfb5f 100644 +index 74d4bb12d70cbfd8365337c8fbcdbdfe6d70e970..0819adb34541e5a774f07616957c785b3d6cd8ea 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1293,6 +1293,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop