diff --git a/leaves-server/unapplied/0121-Do-not-reset-placed-block-on-exception.patch b/leaves-server/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch similarity index 96% rename from leaves-server/unapplied/0121-Do-not-reset-placed-block-on-exception.patch rename to leaves-server/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch index 6610df3b..4bd2ee6d 100644 --- a/leaves-server/unapplied/0121-Do-not-reset-placed-block-on-exception.patch +++ b/leaves-server/minecraft-patches/features/0121-Do-not-reset-placed-block-on-exception.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not reset placed block on exception diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index 5cbd5d04de525c33715bc45826bd2ed446355505..c320cd4b7d994b3a0d23bec1713a8bf910f4ef95 100644 +index 17e35aa9efc55a52ad64f05e8fdc3c7fae3ef0c4..699a0fe62204f0f4b9677ec1e0d894b918b7aef9 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java @@ -92,20 +92,22 @@ public class BlockItem extends Item { diff --git a/leaves-server/unapplied/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch b/leaves-server/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch similarity index 93% rename from leaves-server/unapplied/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch rename to leaves-server/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch index 4bf7a462..bb5f210f 100644 --- a/leaves-server/unapplied/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch +++ b/leaves-server/minecraft-patches/features/0122-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Do not prevent block entity and entity crash at LevelChunk diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java -index d0ae0a73f2a635c008e2d60374d5b85a10216c96..90888df3fb4ee72c02815322b4b1d643c1d1420e 100644 +index d0d78d35c87973629dcd83b22ac0435a7498fe00..56e7df059cd070a8f472d6712dfb08d14ffa8819 100644 --- a/net/minecraft/world/level/chunk/LevelChunk.java +++ b/net/minecraft/world/level/chunk/LevelChunk.java -@@ -945,12 +945,14 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p +@@ -952,12 +952,14 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p profilerFiller.pop(); } catch (Throwable var5) { diff --git a/leaves-server/unapplied/0123-Tripwire-behavior-modifier.patch b/leaves-server/minecraft-patches/features/0123-Tripwire-behavior-modifier.patch similarity index 100% rename from leaves-server/unapplied/0123-Tripwire-behavior-modifier.patch rename to leaves-server/minecraft-patches/features/0123-Tripwire-behavior-modifier.patch diff --git a/leaves-server/unapplied/0124-Old-nether-portal-collision.patch b/leaves-server/minecraft-patches/features/0124-Old-nether-portal-collision.patch similarity index 59% rename from leaves-server/unapplied/0124-Old-nether-portal-collision.patch rename to leaves-server/minecraft-patches/features/0124-Old-nether-portal-collision.patch index 72e8d499..5eb752b8 100644 --- a/leaves-server/unapplied/0124-Old-nether-portal-collision.patch +++ b/leaves-server/minecraft-patches/features/0124-Old-nether-portal-collision.patch @@ -6,15 +6,15 @@ Subject: [PATCH] Old nether portal collision It will be removed in 1.21.6 mojang revert it again. diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java -index 171b383efabbbe849aff28832c47076f85a46307..173e97c27e9373a41d33cda6a877b17a38f516a1 100644 +index 3aabae6e27e692aa65cc931e57306426e0f4d645..76dc4eb719244f002e327919c6b8aac8b359b5f0 100644 --- a/net/minecraft/world/level/block/NetherPortalBlock.java +++ b/net/minecraft/world/level/block/NetherPortalBlock.java -@@ -65,7 +65,7 @@ public class NetherPortalBlock extends Block implements Portal { +@@ -60,7 +60,7 @@ public class NetherPortalBlock extends Block implements Portal { @Override - protected VoxelShape getEntityInsideCollisionShape(BlockState state, BlockGetter level, BlockPos pos, Entity entity) { -- return state.getShape(level, pos); -+ return org.leavesmc.leaves.LeavesConfig.modify.oldMC.oldNetherPortalCollision ? Shapes.block() : state.getShape(level, pos); // Leaves - Old nether portal collision + protected VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { +- return SHAPES.get(state.getValue(AXIS)); ++ return org.leavesmc.leaves.LeavesConfig.modify.oldMC.oldNetherPortalCollision ? Shapes.block() : SHAPES.get(state.getValue(AXIS)); // Leaves - Old nether portal collision } @Override diff --git a/leaves-server/unapplied/0125-Spawn-invulnerable-time.patch b/leaves-server/minecraft-patches/features/0125-Spawn-invulnerable-time.patch similarity index 87% rename from leaves-server/unapplied/0125-Spawn-invulnerable-time.patch rename to leaves-server/minecraft-patches/features/0125-Spawn-invulnerable-time.patch index a00bd132..2e7b658f 100644 --- a/leaves-server/unapplied/0125-Spawn-invulnerable-time.patch +++ b/leaves-server/minecraft-patches/features/0125-Spawn-invulnerable-time.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Spawn invulnerable time diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b2bb4a2c1ba2e924f380f69365ce7384db21eed6..2521f6aff4479710ab10c7df5031f6af273fce64 100644 +index e183131afca79d468f83d6230164e2cac304e98b..00d0206fe9e3717ba423e3daf730b082b755716f 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -221,6 +221,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -232,6 +232,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc private int lastSentFood = -99999999; private boolean lastFoodSaturationZero = true; public int lastSentExp = -99999999; @@ -16,7 +16,7 @@ index b2bb4a2c1ba2e924f380f69365ce7384db21eed6..2521f6aff4479710ab10c7df5031f6af private ChatVisiblity chatVisibility = ChatVisiblity.FULL; public ParticleStatus particleStatus = ParticleStatus.ALL; private boolean canChatColor = true; -@@ -751,6 +752,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -754,6 +755,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.resetOperationCountPerTick(); // Leaves - player operation limiter this.gameMode.tick(); this.wardenSpawnTracker.tick(); @@ -24,7 +24,7 @@ index b2bb4a2c1ba2e924f380f69365ce7384db21eed6..2521f6aff4479710ab10c7df5031f6af if (this.invulnerableTime > 0) { this.invulnerableTime--; } -@@ -1189,6 +1191,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1201,6 +1203,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc if (this.isInvulnerableTo(level, damageSource)) { return false; } else { diff --git a/leaves-server/unapplied/0126-Old-zombie-reinforcement.patch b/leaves-server/minecraft-patches/features/0126-Old-zombie-reinforcement.patch similarity index 86% rename from leaves-server/unapplied/0126-Old-zombie-reinforcement.patch rename to leaves-server/minecraft-patches/features/0126-Old-zombie-reinforcement.patch index 4a82f5f7..636942dd 100644 --- a/leaves-server/unapplied/0126-Old-zombie-reinforcement.patch +++ b/leaves-server/minecraft-patches/features/0126-Old-zombie-reinforcement.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Old zombie reinforcement diff --git a/net/minecraft/world/entity/monster/Zombie.java b/net/minecraft/world/entity/monster/Zombie.java -index 39b65970a48568c95ff482b9636e7391f300ffa8..50417ae5883374113cf820c064570b6aeda4fbb8 100644 +index a23607874a72723914cbfeea0ad1c51236c044d8..cb7b248276bfb6a9721e0bcc42ef00bf7029f263 100644 --- a/net/minecraft/world/entity/monster/Zombie.java +++ b/net/minecraft/world/entity/monster/Zombie.java -@@ -342,7 +342,7 @@ public class Zombie extends Monster { +@@ -341,7 +341,7 @@ public class Zombie extends Monster { int floor = Mth.floor(this.getX()); int floor1 = Mth.floor(this.getY()); int floor2 = Mth.floor(this.getZ()); diff --git a/leaves-server/unapplied/0127-Sound-update-suppression.patch b/leaves-server/minecraft-patches/features/0127-Sound-update-suppression.patch similarity index 94% rename from leaves-server/unapplied/0127-Sound-update-suppression.patch rename to leaves-server/minecraft-patches/features/0127-Sound-update-suppression.patch index 3f407e7d..89776e10 100644 --- a/leaves-server/unapplied/0127-Sound-update-suppression.patch +++ b/leaves-server/minecraft-patches/features/0127-Sound-update-suppression.patch @@ -32,10 +32,10 @@ index fa9cb4c40a41eea7fd63a4513d0b0f39067de9ba..331276f4464d78dc86f35fe7d9c42864 return state.getBlock() instanceof SculkSensorBlock && getPhase(state) == SculkSensorPhase.INACTIVE; // Paper - Check for a valid type } diff --git a/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java b/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java -index 26d2205fe7c1322f52e7d162e1be9dc23349f3b6..9cbba9cdeddd0a722554aca0a1fb41c2def4a46b 100644 +index 9a345fa3438b2d17a5de2fa0c0b0daef5a5183e1..f3f92666265e1b6dcb17124b5f52e84a6d62ccf2 100644 --- a/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java +++ b/net/minecraft/world/level/block/entity/SculkSensorBlockEntity.java -@@ -118,7 +118,7 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList +@@ -113,7 +113,7 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList public boolean canReceiveVibration(ServerLevel level, BlockPos pos, Holder gameEvent, @Nullable GameEvent.Context context) { return (!pos.equals(this.blockPos) || !gameEvent.is(GameEvent.BLOCK_DESTROY) && !gameEvent.is(GameEvent.BLOCK_PLACE)) && VibrationSystem.getGameEventFrequency(gameEvent) != 0 @@ -44,7 +44,7 @@ index 26d2205fe7c1322f52e7d162e1be9dc23349f3b6..9cbba9cdeddd0a722554aca0a1fb41c2 } @Override -@@ -126,7 +126,7 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList +@@ -121,7 +121,7 @@ public class SculkSensorBlockEntity extends BlockEntity implements GameEventList ServerLevel level, BlockPos pos, Holder gameEvent, @Nullable Entity entity, @Nullable Entity playerEntity, float distance ) { BlockState blockState = SculkSensorBlockEntity.this.getBlockState(); diff --git a/leaves-server/unapplied/0128-Old-zombie-piglin-drop-behavior.patch b/leaves-server/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch similarity index 84% rename from leaves-server/unapplied/0128-Old-zombie-piglin-drop-behavior.patch rename to leaves-server/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch index b9eefe24..e65d75f5 100644 --- a/leaves-server/unapplied/0128-Old-zombie-piglin-drop-behavior.patch +++ b/leaves-server/minecraft-patches/features/0128-Old-zombie-piglin-drop-behavior.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Old zombie piglin drop behavior diff --git a/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/net/minecraft/world/entity/monster/ZombifiedPiglin.java -index 05de183ce7b0be9b41f005b2ca36807a109fc634..6c3895f96ef0c3bd69dc5cd0fae56c83116537a3 100644 +index 822712eaff2f6c579d982734ab14a00c02182770..a9d139932cdcf55abef58cc834a1df322aa7d66c 100644 --- a/net/minecraft/world/entity/monster/ZombifiedPiglin.java +++ b/net/minecraft/world/entity/monster/ZombifiedPiglin.java -@@ -159,6 +159,10 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob { +@@ -160,6 +160,10 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob { this.ticksUntilNextAlert = ALERT_INTERVAL.sample(this.random); } diff --git a/leaves-server/unapplied/0129-Fast-exp-orb-absorb.patch b/leaves-server/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch similarity index 93% rename from leaves-server/unapplied/0129-Fast-exp-orb-absorb.patch rename to leaves-server/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch index 58f5e9bd..377e34c3 100644 --- a/leaves-server/unapplied/0129-Fast-exp-orb-absorb.patch +++ b/leaves-server/minecraft-patches/features/0129-Fast-exp-orb-absorb.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fast exp orb absorb diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java -index c97a0e500e889b406cb2d679a3870715775f5393..9ebc2fdf9de21bb4533e4184ec9fb92b698902bd 100644 +index a62edee768c30c99213baa6bd736d67ae52b558c..82fb285f53513cc62f8f7b78b85a91076c73545a 100644 --- a/net/minecraft/world/entity/ExperienceOrb.java +++ b/net/minecraft/world/entity/ExperienceOrb.java -@@ -328,6 +328,20 @@ public class ExperienceOrb extends Entity { +@@ -358,6 +358,20 @@ public class ExperienceOrb extends Entity { public void playerTouch(Player entity) { if (entity instanceof ServerPlayer serverPlayer) { if (entity.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(serverPlayer.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent diff --git a/leaves-server/unapplied/0130-Vanilla-Fluid-Pushing.patch b/leaves-server/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch similarity index 87% rename from leaves-server/unapplied/0130-Vanilla-Fluid-Pushing.patch rename to leaves-server/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch index cc8e1991..03227e5f 100644 --- a/leaves-server/unapplied/0130-Vanilla-Fluid-Pushing.patch +++ b/leaves-server/minecraft-patches/features/0130-Vanilla-Fluid-Pushing.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Vanilla Fluid Pushing diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 529be219452fe64398f91af77ea47c5cbfe8a1df..3c9b659aa473dcc65da4aaaecb4a8132a8206b81 100644 +index b42b0788b7df9f39429d18ce12b525beb7609bd5..aba79f3848ab826869d4050ce02b3483b91f34e2 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4622,8 +4622,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4823,8 +4823,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess final Vec3 flow = fluidState.getFlow(world, mutablePos); diff --git a/leaves-server/unapplied/0131-Configurable-item-damage-check.patch b/leaves-server/minecraft-patches/features/0131-Configurable-item-damage-check.patch similarity index 88% rename from leaves-server/unapplied/0131-Configurable-item-damage-check.patch rename to leaves-server/minecraft-patches/features/0131-Configurable-item-damage-check.patch index eac44ad4..9d074978 100644 --- a/leaves-server/unapplied/0131-Configurable-item-damage-check.patch +++ b/leaves-server/minecraft-patches/features/0131-Configurable-item-damage-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable item damage check diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index 649d17dcd7856e3b1344192d8ea4b2e9f73fc03b..cd3fbccad765a37f034977e44896fbd73e308b91 100644 +index 72f084ebb61ca5b93ddf75e9a14cc8106f908a5f..1356af3e5dfeb9f3a3bb1bcff9109d49c795729d 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java -@@ -621,11 +621,11 @@ public final class ItemStack implements DataComponentHolder { +@@ -597,11 +597,11 @@ public final class ItemStack implements DataComponentHolder { } public int getDamageValue() { diff --git a/leaves-server/unapplied/0132-Old-Throwable-Projectile-tick-order.patch b/leaves-server/minecraft-patches/features/0132-Old-Throwable-Projectile-tick-order.patch similarity index 100% rename from leaves-server/unapplied/0132-Old-Throwable-Projectile-tick-order.patch rename to leaves-server/minecraft-patches/features/0132-Old-Throwable-Projectile-tick-order.patch