diff --git a/build-data/leaf.at b/build-data/leaf.at index 7de708c1..d3f76e37 100644 --- a/build-data/leaf.at +++ b/build-data/leaf.at @@ -1,8 +1,6 @@ # This file is auto generated, any changes may be overridden! # See CONTRIBUTING.md on how to add access transformers. protected net.minecraft.world.entity.Entity dimensions -protected net.minecraft.world.entity.ai.goal.RemoveBlockGoal blockToRemove -protected net.minecraft.world.entity.ai.goal.target.NearestAttackableTargetGoal getTargetConditions()Lnet/minecraft/world/entity/ai/targeting/TargetingConditions; protected-f net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache largeCollisionShape public net.minecraft.core.Direction VALUES public net.minecraft.server.level.ServerChunkCache fullChunks diff --git a/leaf-server/minecraft-patches/features/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/leaf-archived-patches/removed/1.21.8/mcserver/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to leaf-archived-patches/removed/1.21.8/mcserver/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch index 107853f5..945d0d46 100644 --- a/leaf-server/minecraft-patches/features/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch +++ b/leaf-archived-patches/removed/1.21.8/mcserver/0093-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch @@ -3,6 +3,8 @@ From: Kevin Raneri Date: Sat, 11 Dec 2021 22:20:45 -0500 Subject: [PATCH] Pufferfish: Throttle goal selector during inactive ticking +Removed since Leaf 1.21.8, no need + Original license: GPL v3 Original project: https://github.com/pufferfish-gg/Pufferfish diff --git a/leaf-server/minecraft-patches/features/0226-Async-target-finding.patch b/leaf-archived-patches/removed/1.21.8/mcserver/0227-Async-target-finding.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0226-Async-target-finding.patch rename to leaf-archived-patches/removed/1.21.8/mcserver/0227-Async-target-finding.patch index 47964263..212ab211 100644 --- a/leaf-server/minecraft-patches/features/0226-Async-target-finding.patch +++ b/leaf-archived-patches/removed/1.21.8/mcserver/0227-Async-target-finding.patch @@ -3,6 +3,7 @@ From: Taiyou06 Date: Sat, 29 Mar 2025 13:40:46 +0100 Subject: [PATCH] Async target finding +Removed since Leaf 1.21.8, no need diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java index fee4a7452178c274eb835d758b718d8e874d79d0..9a2539e1fe2cee30066634ef47a991fa5837a5e4 100644 diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/ai/AsyncGoalExecutor.java b/leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/AsyncGoalExecutor.java similarity index 100% rename from leaf-server/src/main/java/org/dreeam/leaf/async/ai/AsyncGoalExecutor.java rename to leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/AsyncGoalExecutor.java diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/ai/AsyncGoalThread.java b/leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/AsyncGoalThread.java similarity index 100% rename from leaf-server/src/main/java/org/dreeam/leaf/async/ai/AsyncGoalThread.java rename to leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/AsyncGoalThread.java diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/ai/VWaker.java b/leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/VWaker.java similarity index 100% rename from leaf-server/src/main/java/org/dreeam/leaf/async/ai/VWaker.java rename to leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/VWaker.java diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/ai/Waker.java b/leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/Waker.java similarity index 100% rename from leaf-server/src/main/java/org/dreeam/leaf/async/ai/Waker.java rename to leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/async/ai/Waker.java diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/async/AsyncTargetFinding.java b/leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/config/modules/async/AsyncTargetFinding.java similarity index 100% rename from leaf-server/src/main/java/org/dreeam/leaf/config/modules/async/AsyncTargetFinding.java rename to leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/config/modules/async/AsyncTargetFinding.java diff --git a/leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java b/leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java similarity index 100% rename from leaf-server/src/main/java/org/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java rename to leaf-archived-patches/removed/1.21.8/src/dreeam/leaf/config/modules/opt/ThrottleInactiveGoalSelectorTick.java diff --git a/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch b/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch index 41a14b4e..60c1e20d 100644 --- a/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch +++ b/leaf-server/minecraft-patches/features/0092-Pufferfish-Dynamic-Activation-of-Brain.patch @@ -3,8 +3,6 @@ From: Paul Sauve Date: Fri, 15 Jan 2021 19:05:01 -0600 Subject: [PATCH] Pufferfish: Dynamic Activation of Brain -Dreeam TODO: waiting Paper dealing with the newGoalRate - Original license: GPL v3 Original project: https://github.com/pufferfish-gg/Pufferfish @@ -109,38 +107,6 @@ index 96e1f8f40a0af4350155f192ac2126b523c9f0f5..388689c44cf63ade939e271d490051c9 private final String descriptionId; @Nullable private Component description; -diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 37c6567701fe10011a364b8def9ebf3391376592..cb045fce223482be345066b4fe796341667e8023 100644 ---- a/net/minecraft/world/entity/Mob.java -+++ b/net/minecraft/world/entity/Mob.java -@@ -209,10 +209,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab - @Override - public void inactiveTick() { - super.inactiveTick(); -- if (this.goalSelector.inactiveTick()) { -+ if (this.goalSelector.inactiveTick(this.activatedPriority, true)) { // Pufferfish - pass activated priroity - this.goalSelector.tick(); - } -- if (this.targetSelector.inactiveTick()) { -+ if (this.targetSelector.inactiveTick(this.activatedPriority, true)) { // Pufferfish - pass activated priority - this.targetSelector.tick(); - } - } -@@ -747,10 +747,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab - this.sensing.tick(); - int i = this.tickCount + this.getId(); - if (i % 2 != 0 && this.tickCount > 1) { -+ if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking - this.targetSelector.tickRunningGoals(false); -+ if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking - this.goalSelector.tickRunningGoals(false); - } else { -+ if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking - this.targetSelector.tick(); -+ if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking - this.goalSelector.tick(); - } - diff --git a/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java b/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java index f6c673b1abe53afcb14fd68d590431027ed29f67..21deb221b87ecb70c8a0dc963ab79124b26ac930 100644 --- a/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java @@ -158,26 +124,6 @@ index f6c673b1abe53afcb14fd68d590431027ed29f67..21deb221b87ecb70c8a0dc963ab79124 owner.spawnGolemIfNeeded(level, gameTime, 3); } } -diff --git a/net/minecraft/world/entity/ai/goal/GoalSelector.java b/net/minecraft/world/entity/ai/goal/GoalSelector.java -index 653c58c7637c46c8b46a5082f671324a2221d431..55f1c138039b80894f655d180192f5cb95e32778 100644 ---- a/net/minecraft/world/entity/ai/goal/GoalSelector.java -+++ b/net/minecraft/world/entity/ai/goal/GoalSelector.java -@@ -34,9 +34,13 @@ public class GoalSelector { - } - - // Paper start - EAR 2 -- public boolean inactiveTick() { -+ public boolean inactiveTick(int tickRate, boolean inactive) { // Pufferfish start -+ if (inactive && !org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.enabled) tickRate = 4; // reset to Paper's -+ tickRate = Math.min(tickRate, 3); // Dreeam TODO - Waiting Paper - this.curRate++; -- return this.curRate % 3 == 0; // TODO newGoalRate was already unused in 1.20.4, check if this is correct -+ //return this.curRate % 3 == 0; // TODO newGoalRate was already unused in 1.20.4, check if this is correct -+ return this.curRate % tickRate == 0; -+ // Pufferfish end - } - - public boolean hasTasks() { diff --git a/net/minecraft/world/entity/animal/allay/Allay.java b/net/minecraft/world/entity/animal/allay/Allay.java index de3bf0b62371f06ecb5d2035638e352ca0c06182..69500fa0b207fc3d5b1bc2bd665fa39f6725d23d 100644 --- a/net/minecraft/world/entity/animal/allay/Allay.java diff --git a/leaf-server/minecraft-patches/features/0094-Purpur-Server-Minecraft-Changes.patch b/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0094-Purpur-Server-Minecraft-Changes.patch rename to leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch index fe6d019a..6850f0c3 100644 --- a/leaf-server/minecraft-patches/features/0094-Purpur-Server-Minecraft-Changes.patch +++ b/leaf-server/minecraft-patches/features/0093-Purpur-Server-Minecraft-Changes.patch @@ -2673,7 +2673,7 @@ index da46c16d9ce8c66ce02133d74b2a41f375398528..d79bb361783082ec2aaafdc1b2e6bb4d return slot != EquipmentSlot.HEAD && slot != EquipmentSlot.MAINHAND && slot != EquipmentSlot.OFFHAND ? SlotAccess.forEquipmentSlot(entity, slot, itemStack -> itemStack.isEmpty() || entity.getEquipmentSlotForItem(itemStack) == slot) diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f015807fc6484b 100644 +index 37c6567701fe10011a364b8def9ebf3391376592..706bdb81f831ee79afb8c32feba1a13bdac59c66 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java @@ -138,13 +138,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @@ -2693,7 +2693,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 this.jumpControl = new JumpControl(this); this.bodyRotationControl = this.createBodyControl(); this.navigation = this.createNavigation(level); -@@ -285,6 +286,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -283,6 +284,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab target = null; } } @@ -2701,7 +2701,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 this.target = target; return true; // CraftBukkit end -@@ -324,8 +326,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -322,8 +324,28 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.resetAmbientSoundTime(); this.playAmbientSound(); } @@ -2730,7 +2730,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 @Override protected void playHurtSound(DamageSource source) { this.resetAmbientSoundTime(); -@@ -429,6 +451,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -427,6 +449,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name()); } // Paper end - allow changing despawnInPeaceful @@ -2738,7 +2738,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 } @Override -@@ -457,6 +480,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -455,6 +478,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.setNoAi(input.getBooleanOr("NoAI", false)); this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit this.despawnInPeacefulOverride = input.read("Paper.DespawnInPeacefulOverride", io.papermc.paper.util.PaperCodecs.TRI_STATE_CODEC).orElse(net.kyori.adventure.util.TriState.NOT_SET); // Paper - allow changing despawnInPeaceful @@ -2746,7 +2746,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 } @Override -@@ -509,7 +533,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -507,7 +531,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab && this.canPickUpLoot() && this.isAlive() && !this.dead @@ -2755,7 +2755,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 Vec3i pickupReach = this.getPickupReach(); for (ItemEntity itemEntity : this.level() -@@ -1176,7 +1200,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1170,7 +1194,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab ); } @@ -2764,7 +2764,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 return spawnGroupData; } -@@ -1264,7 +1288,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1258,7 +1282,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } protected InteractionResult mobInteract(Player player, InteractionHand hand) { @@ -2773,7 +2773,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 } public boolean isWithinHome() { -@@ -1513,6 +1537,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1507,6 +1531,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.playAttackSound(); } @@ -2781,7 +2781,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 return flag; } -@@ -1524,26 +1549,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1518,26 +1543,8 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab private net.minecraft.world.phys.Vec3 cached_position; // Gale end - JettPack - optimize sun burn tick - cache eye blockpos public boolean isSunBurnTick() { @@ -2810,7 +2810,7 @@ index 37a83f45307cc73a52bb0995e71b5edd218b0d2e..702722bf42bbd0746e12d3a967f01580 } @Override -@@ -1591,4 +1598,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1585,4 +1592,58 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab this.getNavigation().updatePathfinderMaxVisitedNodes(); } } diff --git a/leaf-server/minecraft-patches/features/0095-Fix-Pufferfish-and-Purpur-patches.patch b/leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0095-Fix-Pufferfish-and-Purpur-patches.patch rename to leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch index d501e976..7468e624 100644 --- a/leaf-server/minecraft-patches/features/0095-Fix-Pufferfish-and-Purpur-patches.patch +++ b/leaf-server/minecraft-patches/features/0094-Fix-Pufferfish-and-Purpur-patches.patch @@ -78,7 +78,7 @@ index 2c7f35ec3276f420875cf52596ada42b25fe64c8..a0941c15a9391f85af9fcb3784c66514 this.disconnectAsync(Component.literal("Book too large!"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION); // Paper - kick event cause // Paper - add proper async disconnect return; diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 53a0d464c1eb68ee2eff7f93c5c745ee4667093a..e0615ffe3e5cd317e5f05e167dbc857d5abaf50f 100644 +index 98f9a1378c6cef93adb431730972d6b05c14b121..4a1cfd5247073bd57f88151425ea1c866d971c4d 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -543,23 +543,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -150,10 +150,10 @@ index d79bb361783082ec2aaafdc1b2e6bb4d51813666..f712d4445d8ffdc8dbd5f51c2a8104b0 } // Purpur end - Mob head visibility percent diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 702722bf42bbd0746e12d3a967f015807fc6484b..6aed8d7c737a35943718535226cedd65f86d3b3c 100644 +index 706bdb81f831ee79afb8c32feba1a13bdac59c66..26db3eb9dfc3d9c0c7efa4cf25827f15c37a7775 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -1544,10 +1544,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1538,10 +1538,6 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() { } @@ -293,7 +293,7 @@ index fb58af763cf75c80703360a5c668168775b1458c..e442784741f1d0b4892284b6811343f9 PiglinAi.updateActivity(this); super.customServerAiStep(level); diff --git a/net/minecraft/world/entity/projectile/Projectile.java b/net/minecraft/world/entity/projectile/Projectile.java -index ef960ee83adbb5e3ebfa44cd2457b23718045f61..e53c18efb573dea39a3d45f3cdb827d73b901ab6 100644 +index 5daa37fc0e44d3c4f3755ec3d3d89213f6670de1..c98a15653e388e7d8301ac4f6baa11095b7b18cc 100644 --- a/net/minecraft/world/entity/projectile/Projectile.java +++ b/net/minecraft/world/entity/projectile/Projectile.java @@ -82,7 +82,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { diff --git a/leaf-server/minecraft-patches/features/0096-Purpur-Configurable-server-mod-name.patch b/leaf-server/minecraft-patches/features/0095-Purpur-Configurable-server-mod-name.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0096-Purpur-Configurable-server-mod-name.patch rename to leaf-server/minecraft-patches/features/0095-Purpur-Configurable-server-mod-name.patch diff --git a/leaf-server/minecraft-patches/features/0097-Configurable-server-GUI-name.patch b/leaf-server/minecraft-patches/features/0096-Configurable-server-GUI-name.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0097-Configurable-server-GUI-name.patch rename to leaf-server/minecraft-patches/features/0096-Configurable-server-GUI-name.patch diff --git a/leaf-server/minecraft-patches/features/0098-Remove-vanilla-username-check.patch b/leaf-server/minecraft-patches/features/0097-Remove-vanilla-username-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0098-Remove-vanilla-username-check.patch rename to leaf-server/minecraft-patches/features/0097-Remove-vanilla-username-check.patch diff --git a/leaf-server/minecraft-patches/features/0099-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch b/leaf-server/minecraft-patches/features/0098-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0099-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch rename to leaf-server/minecraft-patches/features/0098-Remove-Spigot-check-for-broken-BungeeCord-configurat.patch diff --git a/leaf-server/minecraft-patches/features/0100-Remove-UseItemOnPacket-Too-Far-check.patch b/leaf-server/minecraft-patches/features/0099-Remove-UseItemOnPacket-Too-Far-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0100-Remove-UseItemOnPacket-Too-Far-check.patch rename to leaf-server/minecraft-patches/features/0099-Remove-UseItemOnPacket-Too-Far-check.patch diff --git a/leaf-server/minecraft-patches/features/0101-Remove-change-non-editable-sign-warning.patch b/leaf-server/minecraft-patches/features/0100-Remove-change-non-editable-sign-warning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0101-Remove-change-non-editable-sign-warning.patch rename to leaf-server/minecraft-patches/features/0100-Remove-change-non-editable-sign-warning.patch diff --git a/leaf-server/minecraft-patches/features/0102-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/leaf-server/minecraft-patches/features/0101-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0102-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch rename to leaf-server/minecraft-patches/features/0101-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch diff --git a/leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Optimized-getBiome-method.patch b/leaf-server/minecraft-patches/features/0102-Carpet-Fixes-Optimized-getBiome-method.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Optimized-getBiome-method.patch rename to leaf-server/minecraft-patches/features/0102-Carpet-Fixes-Optimized-getBiome-method.patch diff --git a/leaf-server/minecraft-patches/features/0104-Carpet-Fixes-Use-optimized-RecipeManager.patch b/leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Use-optimized-RecipeManager.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0104-Carpet-Fixes-Use-optimized-RecipeManager.patch rename to leaf-server/minecraft-patches/features/0103-Carpet-Fixes-Use-optimized-RecipeManager.patch diff --git a/leaf-server/minecraft-patches/features/0105-Akarin-Save-Json-list-asynchronously.patch b/leaf-server/minecraft-patches/features/0104-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0105-Akarin-Save-Json-list-asynchronously.patch rename to leaf-server/minecraft-patches/features/0104-Akarin-Save-Json-list-asynchronously.patch diff --git a/leaf-server/minecraft-patches/features/0106-Slice-Smooth-Teleports.patch b/leaf-server/minecraft-patches/features/0105-Slice-Smooth-Teleports.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0106-Slice-Smooth-Teleports.patch rename to leaf-server/minecraft-patches/features/0105-Slice-Smooth-Teleports.patch diff --git a/leaf-server/minecraft-patches/features/0107-Parchment-Make-FixLight-use-action-bar.patch b/leaf-server/minecraft-patches/features/0106-Parchment-Make-FixLight-use-action-bar.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0107-Parchment-Make-FixLight-use-action-bar.patch rename to leaf-server/minecraft-patches/features/0106-Parchment-Make-FixLight-use-action-bar.patch diff --git a/leaf-server/minecraft-patches/features/0108-Leaves-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0108-Leaves-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch index 76712d96..57a7877c 100644 --- a/leaf-server/minecraft-patches/features/0108-Leaves-Protocol-Core.patch +++ b/leaf-server/minecraft-patches/features/0107-Leaves-Protocol-Core.patch @@ -50,7 +50,7 @@ index 7b4437c06c2ede0be7dd58b42863e88b4b205106..73c63330b67b3d16ceebc644ce177980 this.tickables.get(i).run(); } diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index ca9ba2a2535eab66622230778efdf941f540f6d2..fa6095200243fafa796e49df3930c6d7ab2dcd84 100644 +index 9af8f731bd583c46b93336b635ba9a5cea7e1ff3..82c22ca54cc7c8371b744c93f133dfc2b798195b 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -64,6 +64,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack diff --git a/leaf-server/minecraft-patches/features/0109-Leaves-Jade-Protocol.patch b/leaf-server/minecraft-patches/features/0108-Leaves-Jade-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0109-Leaves-Jade-Protocol.patch rename to leaf-server/minecraft-patches/features/0108-Leaves-Jade-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch b/leaf-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0110-Leaves-Xaero-Map-Protocol.patch rename to leaf-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0111-Leaves-Syncmatica-Protocol.patch b/leaf-server/minecraft-patches/features/0110-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0111-Leaves-Syncmatica-Protocol.patch rename to leaf-server/minecraft-patches/features/0110-Leaves-Syncmatica-Protocol.patch diff --git a/leaf-server/minecraft-patches/features/0112-Leaves-Replay-Mod-API.patch b/leaf-server/minecraft-patches/features/0111-Leaves-Replay-Mod-API.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0112-Leaves-Replay-Mod-API.patch rename to leaf-server/minecraft-patches/features/0111-Leaves-Replay-Mod-API.patch diff --git a/leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch b/leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch rename to leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch index f9c3c5f8..c53427e2 100644 --- a/leaf-server/minecraft-patches/features/0113-Petal-Async-Pathfinding.patch +++ b/leaf-server/minecraft-patches/features/0112-Petal-Async-Pathfinding.patch @@ -19,10 +19,10 @@ This patch was ported downstream from the Petal fork. Makes most pathfinding-related work happen asynchronously diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index 6aed8d7c737a35943718535226cedd65f86d3b3c..ec50760ec81728a0b8ab8d691ed65ba6d25d32f9 100644 +index 26db3eb9dfc3d9c0c7efa4cf25827f15c37a7775..e5a93f7256d904a3401a68ca8ad5962d92ed67f3 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -247,6 +247,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -245,6 +245,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @Nullable @Override public LivingEntity getTarget() { diff --git a/leaf-server/minecraft-patches/features/0114-Petal-reduce-work-done-by-game-event-system.patch b/leaf-server/minecraft-patches/features/0113-Petal-reduce-work-done-by-game-event-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0114-Petal-reduce-work-done-by-game-event-system.patch rename to leaf-server/minecraft-patches/features/0113-Petal-reduce-work-done-by-game-event-system.patch diff --git a/leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch b/leaf-server/minecraft-patches/features/0114-Reduce-canSee-work.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0115-Reduce-canSee-work.patch rename to leaf-server/minecraft-patches/features/0114-Reduce-canSee-work.patch diff --git a/leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch b/leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0116-Fix-sprint-glitch.patch rename to leaf-server/minecraft-patches/features/0115-Fix-sprint-glitch.patch diff --git a/leaf-server/minecraft-patches/features/0117-Configurable-movement-speed-of-more-entities.patch b/leaf-server/minecraft-patches/features/0116-Configurable-movement-speed-of-more-entities.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0117-Configurable-movement-speed-of-more-entities.patch rename to leaf-server/minecraft-patches/features/0116-Configurable-movement-speed-of-more-entities.patch diff --git a/leaf-server/minecraft-patches/features/0118-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/leaf-server/minecraft-patches/features/0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0118-Faster-sequencing-of-futures-for-chunk-structure-gen.patch rename to leaf-server/minecraft-patches/features/0117-Faster-sequencing-of-futures-for-chunk-structure-gen.patch diff --git a/leaf-server/minecraft-patches/features/0119-Reduce-active-items-finding-hopper-nearby-check.patch b/leaf-server/minecraft-patches/features/0118-Reduce-active-items-finding-hopper-nearby-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0119-Reduce-active-items-finding-hopper-nearby-check.patch rename to leaf-server/minecraft-patches/features/0118-Reduce-active-items-finding-hopper-nearby-check.patch diff --git a/leaf-server/minecraft-patches/features/0120-Plazma-Add-some-missing-Pufferfish-configurations.patch b/leaf-server/minecraft-patches/features/0119-Plazma-Add-some-missing-Pufferfish-configurations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0120-Plazma-Add-some-missing-Pufferfish-configurations.patch rename to leaf-server/minecraft-patches/features/0119-Plazma-Add-some-missing-Pufferfish-configurations.patch diff --git a/leaf-server/minecraft-patches/features/0121-Plazma-Add-missing-purpur-configuration-options.patch b/leaf-server/minecraft-patches/features/0120-Plazma-Add-missing-purpur-configuration-options.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0121-Plazma-Add-missing-purpur-configuration-options.patch rename to leaf-server/minecraft-patches/features/0120-Plazma-Add-missing-purpur-configuration-options.patch diff --git a/leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to leaf-server/minecraft-patches/features/0121-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/leaf-server/minecraft-patches/features/0123-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0123-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to leaf-server/minecraft-patches/features/0122-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/leaf-server/minecraft-patches/features/0124-SparklyPaper-Optimize-canSee-checks.patch b/leaf-server/minecraft-patches/features/0123-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0124-SparklyPaper-Optimize-canSee-checks.patch rename to leaf-server/minecraft-patches/features/0123-SparklyPaper-Optimize-canSee-checks.patch diff --git a/leaf-server/minecraft-patches/features/0125-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch b/leaf-server/minecraft-patches/features/0124-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0125-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch rename to leaf-server/minecraft-patches/features/0124-SparklyPaper-Allow-throttling-hopper-checks-if-the-t.patch diff --git a/leaf-server/minecraft-patches/features/0126-Polpot-Make-egg-and-snowball-can-knockback-player.patch b/leaf-server/minecraft-patches/features/0125-Polpot-Make-egg-and-snowball-can-knockback-player.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0126-Polpot-Make-egg-and-snowball-can-knockback-player.patch rename to leaf-server/minecraft-patches/features/0125-Polpot-Make-egg-and-snowball-can-knockback-player.patch diff --git a/leaf-server/minecraft-patches/features/0127-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch b/leaf-server/minecraft-patches/features/0126-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0127-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch rename to leaf-server/minecraft-patches/features/0126-Redirect-vanilla-getProfiler-to-inactive-in-PathNavi.patch diff --git a/leaf-server/minecraft-patches/features/0128-Remove-useless-creating-stats-json-bases-on-player-n.patch b/leaf-server/minecraft-patches/features/0127-Remove-useless-creating-stats-json-bases-on-player-n.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0128-Remove-useless-creating-stats-json-bases-on-player-n.patch rename to leaf-server/minecraft-patches/features/0127-Remove-useless-creating-stats-json-bases-on-player-n.patch diff --git a/leaf-server/minecraft-patches/features/0129-Improve-Purpur-AFK-system.patch b/leaf-server/minecraft-patches/features/0128-Improve-Purpur-AFK-system.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0129-Improve-Purpur-AFK-system.patch rename to leaf-server/minecraft-patches/features/0128-Improve-Purpur-AFK-system.patch diff --git a/leaf-server/minecraft-patches/features/0130-Virtual-thread-for-chat-executor.patch b/leaf-server/minecraft-patches/features/0129-Virtual-thread-for-chat-executor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0130-Virtual-thread-for-chat-executor.patch rename to leaf-server/minecraft-patches/features/0129-Virtual-thread-for-chat-executor.patch diff --git a/leaf-server/minecraft-patches/features/0131-Virtual-thread-for-user-authenticator.patch b/leaf-server/minecraft-patches/features/0130-Virtual-thread-for-user-authenticator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0131-Virtual-thread-for-user-authenticator.patch rename to leaf-server/minecraft-patches/features/0130-Virtual-thread-for-user-authenticator.patch diff --git a/leaf-server/minecraft-patches/features/0132-Mirai-Configurable-chat-message-signatures.patch b/leaf-server/minecraft-patches/features/0131-Mirai-Configurable-chat-message-signatures.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0132-Mirai-Configurable-chat-message-signatures.patch rename to leaf-server/minecraft-patches/features/0131-Mirai-Configurable-chat-message-signatures.patch index 2d06365b..9503931d 100644 --- a/leaf-server/minecraft-patches/features/0132-Mirai-Configurable-chat-message-signatures.patch +++ b/leaf-server/minecraft-patches/features/0131-Mirai-Configurable-chat-message-signatures.patch @@ -103,7 +103,7 @@ index 87fc8861948b50361ec04c5a23406d3abdec6eac..77f11179836636424927843f5f10c3fd // Paper start - Add setting for proxy online mode status return properties.enforceSecureProfile diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index fa6095200243fafa796e49df3930c6d7ab2dcd84..84030c40f2f91b433b3ccd21e0367d2f8b7c97b6 100644 +index 82c22ca54cc7c8371b744c93f133dfc2b798195b..6b73679351f786362daf988b02b2a226d6b43984 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -363,10 +363,30 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack diff --git a/leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed.patch b/leaf-server/minecraft-patches/features/0132-Matter-Secure-Seed.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed.patch rename to leaf-server/minecraft-patches/features/0132-Matter-Secure-Seed.patch diff --git a/leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed-command.patch b/leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed-command.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0134-Matter-Secure-Seed-command.patch rename to leaf-server/minecraft-patches/features/0133-Matter-Secure-Seed-command.patch diff --git a/leaf-server/minecraft-patches/features/0135-Faster-random-generator.patch b/leaf-server/minecraft-patches/features/0134-Faster-random-generator.patch similarity index 99% rename from leaf-server/minecraft-patches/features/0135-Faster-random-generator.patch rename to leaf-server/minecraft-patches/features/0134-Faster-random-generator.patch index 74bacc80..7febd870 100644 --- a/leaf-server/minecraft-patches/features/0135-Faster-random-generator.patch +++ b/leaf-server/minecraft-patches/features/0134-Faster-random-generator.patch @@ -97,7 +97,7 @@ index 8516d47b0ba79d91638837199e7ae0fb6cb44a79..4f4b55dd099dd2c2fea118b18b535881 RandomSource fork(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index e0615ffe3e5cd317e5f05e167dbc857d5abaf50f..c44cc7107ff6cf1fd72e222773847deddf05e61c 100644 +index 4a1cfd5247073bd57f88151425ea1c866d971c4d..d544d66542d53db1a847a6b1ab8cf5ee848f31de 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -155,7 +155,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0136-Don-t-save-primed-tnt-entity.patch b/leaf-server/minecraft-patches/features/0135-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0136-Don-t-save-primed-tnt-entity.patch rename to leaf-server/minecraft-patches/features/0135-Don-t-save-primed-tnt-entity.patch diff --git a/leaf-server/minecraft-patches/features/0137-Don-t-save-falling-block-entity.patch b/leaf-server/minecraft-patches/features/0136-Don-t-save-falling-block-entity.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0137-Don-t-save-falling-block-entity.patch rename to leaf-server/minecraft-patches/features/0136-Don-t-save-falling-block-entity.patch diff --git a/leaf-server/minecraft-patches/features/0138-Configurable-connection-message.patch b/leaf-server/minecraft-patches/features/0137-Configurable-connection-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0138-Configurable-connection-message.patch rename to leaf-server/minecraft-patches/features/0137-Configurable-connection-message.patch diff --git a/leaf-server/minecraft-patches/features/0139-Configurable-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0138-Configurable-unknown-command-message.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0139-Configurable-unknown-command-message.patch rename to leaf-server/minecraft-patches/features/0138-Configurable-unknown-command-message.patch diff --git a/leaf-server/minecraft-patches/features/0140-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/leaf-server/minecraft-patches/features/0139-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0140-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to leaf-server/minecraft-patches/features/0139-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/leaf-server/minecraft-patches/features/0141-Remove-stream-in-entity-visible-effects-filter.patch b/leaf-server/minecraft-patches/features/0140-Remove-stream-in-entity-visible-effects-filter.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0141-Remove-stream-in-entity-visible-effects-filter.patch rename to leaf-server/minecraft-patches/features/0140-Remove-stream-in-entity-visible-effects-filter.patch diff --git a/leaf-server/minecraft-patches/features/0142-Remove-stream-and-double-iteration-in-enough-deep-sl.patch b/leaf-server/minecraft-patches/features/0141-Remove-stream-and-double-iteration-in-enough-deep-sl.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0142-Remove-stream-and-double-iteration-in-enough-deep-sl.patch rename to leaf-server/minecraft-patches/features/0141-Remove-stream-and-double-iteration-in-enough-deep-sl.patch diff --git a/leaf-server/minecraft-patches/features/0143-Remove-stream-in-trial-spawner-ticking.patch b/leaf-server/minecraft-patches/features/0142-Remove-stream-in-trial-spawner-ticking.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0143-Remove-stream-in-trial-spawner-ticking.patch rename to leaf-server/minecraft-patches/features/0142-Remove-stream-in-trial-spawner-ticking.patch diff --git a/leaf-server/minecraft-patches/features/0144-Remove-stream-in-Brain.patch b/leaf-server/minecraft-patches/features/0143-Remove-stream-in-Brain.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0144-Remove-stream-in-Brain.patch rename to leaf-server/minecraft-patches/features/0143-Remove-stream-in-Brain.patch diff --git a/leaf-server/minecraft-patches/features/0145-Remove-stream-in-BehaviorUtils.patch b/leaf-server/minecraft-patches/features/0144-Remove-stream-in-BehaviorUtils.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0145-Remove-stream-in-BehaviorUtils.patch rename to leaf-server/minecraft-patches/features/0144-Remove-stream-in-BehaviorUtils.patch diff --git a/leaf-server/minecraft-patches/features/0146-Remove-stream-in-YieldJobSite.patch b/leaf-server/minecraft-patches/features/0145-Remove-stream-in-YieldJobSite.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0146-Remove-stream-in-YieldJobSite.patch rename to leaf-server/minecraft-patches/features/0145-Remove-stream-in-YieldJobSite.patch diff --git a/leaf-server/minecraft-patches/features/0147-Remove-stream-in-PlayerSensor.patch b/leaf-server/minecraft-patches/features/0146-Remove-stream-in-PlayerSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0147-Remove-stream-in-PlayerSensor.patch rename to leaf-server/minecraft-patches/features/0146-Remove-stream-in-PlayerSensor.patch diff --git a/leaf-server/minecraft-patches/features/0148-Remove-stream-in-GolemSensor.patch b/leaf-server/minecraft-patches/features/0147-Remove-stream-in-GolemSensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0148-Remove-stream-in-GolemSensor.patch rename to leaf-server/minecraft-patches/features/0147-Remove-stream-in-GolemSensor.patch diff --git a/leaf-server/minecraft-patches/features/0149-Remove-stream-in-GateBehavior.patch b/leaf-server/minecraft-patches/features/0148-Remove-stream-in-GateBehavior.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0149-Remove-stream-in-GateBehavior.patch rename to leaf-server/minecraft-patches/features/0148-Remove-stream-in-GateBehavior.patch diff --git a/leaf-server/minecraft-patches/features/0150-Remove-stream-in-matchingSlot.patch b/leaf-server/minecraft-patches/features/0149-Remove-stream-in-matchingSlot.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0150-Remove-stream-in-matchingSlot.patch rename to leaf-server/minecraft-patches/features/0149-Remove-stream-in-matchingSlot.patch diff --git a/leaf-server/minecraft-patches/features/0151-Remove-stream-in-entity-mountedOrDismounted-changes-.patch b/leaf-server/minecraft-patches/features/0150-Remove-stream-in-entity-mountedOrDismounted-changes-.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0151-Remove-stream-in-entity-mountedOrDismounted-changes-.patch rename to leaf-server/minecraft-patches/features/0150-Remove-stream-in-entity-mountedOrDismounted-changes-.patch diff --git a/leaf-server/minecraft-patches/features/0152-Replace-Entity-active-effects-map-with-optimized-col.patch b/leaf-server/minecraft-patches/features/0151-Replace-Entity-active-effects-map-with-optimized-col.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0152-Replace-Entity-active-effects-map-with-optimized-col.patch rename to leaf-server/minecraft-patches/features/0151-Replace-Entity-active-effects-map-with-optimized-col.patch diff --git a/leaf-server/minecraft-patches/features/0153-Replace-criterion-map-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0152-Replace-criterion-map-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0153-Replace-criterion-map-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0152-Replace-criterion-map-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0154-Replace-brain-with-optimized-collection.patch b/leaf-server/minecraft-patches/features/0153-Replace-brain-with-optimized-collection.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0154-Replace-brain-with-optimized-collection.patch rename to leaf-server/minecraft-patches/features/0153-Replace-brain-with-optimized-collection.patch diff --git a/leaf-server/minecraft-patches/features/0155-Reduce-worldgen-allocations.patch b/leaf-server/minecraft-patches/features/0154-Reduce-worldgen-allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0155-Reduce-worldgen-allocations.patch rename to leaf-server/minecraft-patches/features/0154-Reduce-worldgen-allocations.patch diff --git a/leaf-server/minecraft-patches/features/0156-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch b/leaf-server/minecraft-patches/features/0155-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0156-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch rename to leaf-server/minecraft-patches/features/0155-Use-caffeine-cache-for-kickPermission-instead-of-usi.patch diff --git a/leaf-server/minecraft-patches/features/0157-Do-not-place-player-if-the-server-is-full.patch b/leaf-server/minecraft-patches/features/0156-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0157-Do-not-place-player-if-the-server-is-full.patch rename to leaf-server/minecraft-patches/features/0156-Do-not-place-player-if-the-server-is-full.patch diff --git a/leaf-server/minecraft-patches/features/0158-Fix-MC-65198.patch b/leaf-server/minecraft-patches/features/0157-Fix-MC-65198.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0158-Fix-MC-65198.patch rename to leaf-server/minecraft-patches/features/0157-Fix-MC-65198.patch diff --git a/leaf-server/minecraft-patches/features/0159-Fix-MC-200418.patch b/leaf-server/minecraft-patches/features/0158-Fix-MC-200418.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0159-Fix-MC-200418.patch rename to leaf-server/minecraft-patches/features/0158-Fix-MC-200418.patch diff --git a/leaf-server/minecraft-patches/features/0160-Fix-MC-119417.patch b/leaf-server/minecraft-patches/features/0159-Fix-MC-119417.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0160-Fix-MC-119417.patch rename to leaf-server/minecraft-patches/features/0159-Fix-MC-119417.patch diff --git a/leaf-server/minecraft-patches/features/0161-Fix-MC-223153.patch b/leaf-server/minecraft-patches/features/0160-Fix-MC-223153.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0161-Fix-MC-223153.patch rename to leaf-server/minecraft-patches/features/0160-Fix-MC-223153.patch diff --git a/leaf-server/minecraft-patches/features/0162-Configurable-player-knockback-zombie.patch b/leaf-server/minecraft-patches/features/0161-Configurable-player-knockback-zombie.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0162-Configurable-player-knockback-zombie.patch rename to leaf-server/minecraft-patches/features/0161-Configurable-player-knockback-zombie.patch diff --git a/leaf-server/minecraft-patches/features/0163-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch b/leaf-server/minecraft-patches/features/0162-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch similarity index 77% rename from leaf-server/minecraft-patches/features/0163-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch rename to leaf-server/minecraft-patches/features/0162-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch index 57387abc..be441fb5 100644 --- a/leaf-server/minecraft-patches/features/0163-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch +++ b/leaf-server/minecraft-patches/features/0162-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch @@ -8,10 +8,10 @@ Original project: https://github.com/PaperMC/Paper Paper pull request: https://github.com/PaperMC/Paper/pull/10990 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index ec50760ec81728a0b8ab8d691ed65ba6d25d32f9..b22960f06f92ef4d9d12ab5b3891363534567a29 100644 +index e5a93f7256d904a3401a68ca8ad5962d92ed67f3..751c8c17c3c2968fad358ae8807eaca54de82a34 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -211,6 +211,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -210,6 +210,11 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab @Override public void inactiveTick() { super.inactiveTick(); @@ -20,9 +20,9 @@ index ec50760ec81728a0b8ab8d691ed65ba6d25d32f9..b22960f06f92ef4d9d12ab5b38913635 + return; + } + // Paper PR end - Skip AI during inactive ticks for non-aware mobs - boolean isThrottled = org.dreeam.leaf.config.modules.opt.ThrottleInactiveGoalSelectorTick.enabled && _pufferfish_inactiveTickDisableCounter++ % 20 != 0; // Pufferfish - throttle inactive goal selector ticking - if (this.goalSelector.inactiveTick(this.activatedPriority, true) && !isThrottled) { // Pufferfish - pass activated priroity // Pufferfish - throttle inactive goal selector ticking + if (this.goalSelector.inactiveTick()) { this.goalSelector.tick(); + } diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java index 014bb5b6e82bb11b756430999522f4b8f9356d9f..e6a750ab472eba53de1e5f9e2f507f3a0a9d94d4 100644 --- a/net/minecraft/world/entity/npc/Villager.java diff --git a/leaf-server/minecraft-patches/features/0164-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/leaf-server/minecraft-patches/features/0163-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0164-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch rename to leaf-server/minecraft-patches/features/0163-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch diff --git a/leaf-server/minecraft-patches/features/0165-Paper-PR-Fix-some-beacon-event-issues.patch b/leaf-server/minecraft-patches/features/0164-Paper-PR-Fix-some-beacon-event-issues.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0165-Paper-PR-Fix-some-beacon-event-issues.patch rename to leaf-server/minecraft-patches/features/0164-Paper-PR-Fix-some-beacon-event-issues.patch diff --git a/leaf-server/minecraft-patches/features/0166-Dont-send-useless-entity-packets.patch b/leaf-server/minecraft-patches/features/0165-Dont-send-useless-entity-packets.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0166-Dont-send-useless-entity-packets.patch rename to leaf-server/minecraft-patches/features/0165-Dont-send-useless-entity-packets.patch diff --git a/leaf-server/minecraft-patches/features/0167-Multithreaded-Tracker.patch b/leaf-server/minecraft-patches/features/0166-Multithreaded-Tracker.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0167-Multithreaded-Tracker.patch rename to leaf-server/minecraft-patches/features/0166-Multithreaded-Tracker.patch diff --git a/leaf-server/minecraft-patches/features/0168-Nitori-Async-playerdata-saving.patch b/leaf-server/minecraft-patches/features/0167-Nitori-Async-playerdata-saving.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0168-Nitori-Async-playerdata-saving.patch rename to leaf-server/minecraft-patches/features/0167-Nitori-Async-playerdata-saving.patch diff --git a/leaf-server/minecraft-patches/features/0169-Optimize-nearby-alive-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0168-Optimize-nearby-alive-players-for-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0169-Optimize-nearby-alive-players-for-spawning.patch rename to leaf-server/minecraft-patches/features/0168-Optimize-nearby-alive-players-for-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0170-Cache-blockstate-cache-array.patch b/leaf-server/minecraft-patches/features/0169-Cache-blockstate-cache-array.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0170-Cache-blockstate-cache-array.patch rename to leaf-server/minecraft-patches/features/0169-Cache-blockstate-cache-array.patch diff --git a/leaf-server/minecraft-patches/features/0171-Asynchronous-locator.patch b/leaf-server/minecraft-patches/features/0170-Asynchronous-locator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0171-Asynchronous-locator.patch rename to leaf-server/minecraft-patches/features/0170-Asynchronous-locator.patch diff --git a/leaf-server/minecraft-patches/features/0172-Smart-sort-entities-in-NearestLivingEntitySensor.patch b/leaf-server/minecraft-patches/features/0171-Smart-sort-entities-in-NearestLivingEntitySensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0172-Smart-sort-entities-in-NearestLivingEntitySensor.patch rename to leaf-server/minecraft-patches/features/0171-Smart-sort-entities-in-NearestLivingEntitySensor.patch diff --git a/leaf-server/minecraft-patches/features/0173-Further-reduce-memory-footprint-of-CompoundTag.patch b/leaf-server/minecraft-patches/features/0172-Further-reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0173-Further-reduce-memory-footprint-of-CompoundTag.patch rename to leaf-server/minecraft-patches/features/0172-Further-reduce-memory-footprint-of-CompoundTag.patch diff --git a/leaf-server/minecraft-patches/features/0174-Optimize-Entity-distanceToSqr.patch b/leaf-server/minecraft-patches/features/0173-Optimize-Entity-distanceToSqr.patch similarity index 97% rename from leaf-server/minecraft-patches/features/0174-Optimize-Entity-distanceToSqr.patch rename to leaf-server/minecraft-patches/features/0173-Optimize-Entity-distanceToSqr.patch index fe7d77ea..eeb7012a 100644 --- a/leaf-server/minecraft-patches/features/0174-Optimize-Entity-distanceToSqr.patch +++ b/leaf-server/minecraft-patches/features/0173-Optimize-Entity-distanceToSqr.patch @@ -8,7 +8,7 @@ avoids multiple casting in Entity#distanceTo, using Math#sqrt directly instead o these methods more able to be inlined by the JIT compiler. diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index c44cc7107ff6cf1fd72e222773847deddf05e61c..beb84756c7f875e24ae1561a75db88c001595e58 100644 +index d544d66542d53db1a847a6b1ab8cf5ee848f31de..e563b636a05a299d860a334987594dbd5c7d3511 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -394,6 +394,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0175-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch b/leaf-server/minecraft-patches/features/0174-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0175-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch rename to leaf-server/minecraft-patches/features/0174-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch diff --git a/leaf-server/minecraft-patches/features/0176-Cache-tile-entity-position.patch b/leaf-server/minecraft-patches/features/0175-Cache-tile-entity-position.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0176-Cache-tile-entity-position.patch rename to leaf-server/minecraft-patches/features/0175-Cache-tile-entity-position.patch diff --git a/leaf-server/minecraft-patches/features/0177-TT20-Lag-compensation.patch b/leaf-server/minecraft-patches/features/0176-TT20-Lag-compensation.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0177-TT20-Lag-compensation.patch rename to leaf-server/minecraft-patches/features/0176-TT20-Lag-compensation.patch diff --git a/leaf-server/minecraft-patches/features/0178-C2ME-Reduce-Allocations.patch b/leaf-server/minecraft-patches/features/0177-C2ME-Reduce-Allocations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0178-C2ME-Reduce-Allocations.patch rename to leaf-server/minecraft-patches/features/0177-C2ME-Reduce-Allocations.patch diff --git a/leaf-server/minecraft-patches/features/0179-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/leaf-server/minecraft-patches/features/0178-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0179-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to leaf-server/minecraft-patches/features/0178-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch diff --git a/leaf-server/minecraft-patches/features/0180-Lithium-fast-util.patch b/leaf-server/minecraft-patches/features/0179-Lithium-fast-util.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0180-Lithium-fast-util.patch rename to leaf-server/minecraft-patches/features/0179-Lithium-fast-util.patch diff --git a/leaf-server/minecraft-patches/features/0181-Lithium-cached-iterate-outwards.patch b/leaf-server/minecraft-patches/features/0180-Lithium-cached-iterate-outwards.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0181-Lithium-cached-iterate-outwards.patch rename to leaf-server/minecraft-patches/features/0180-Lithium-cached-iterate-outwards.patch diff --git a/leaf-server/minecraft-patches/features/0182-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/leaf-server/minecraft-patches/features/0181-Use-faster-and-thread-safe-ban-list-date-format-pars.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0182-Use-faster-and-thread-safe-ban-list-date-format-pars.patch rename to leaf-server/minecraft-patches/features/0181-Use-faster-and-thread-safe-ban-list-date-format-pars.patch diff --git a/leaf-server/minecraft-patches/features/0183-C2ME-Optimize-world-gen-math.patch b/leaf-server/minecraft-patches/features/0182-C2ME-Optimize-world-gen-math.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0183-C2ME-Optimize-world-gen-math.patch rename to leaf-server/minecraft-patches/features/0182-C2ME-Optimize-world-gen-math.patch diff --git a/leaf-server/minecraft-patches/features/0184-Cache-chunk-key.patch b/leaf-server/minecraft-patches/features/0183-Cache-chunk-key.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0184-Cache-chunk-key.patch rename to leaf-server/minecraft-patches/features/0183-Cache-chunk-key.patch diff --git a/leaf-server/minecraft-patches/features/0185-Cache-part-of-canHoldFluid-result.patch b/leaf-server/minecraft-patches/features/0184-Cache-part-of-canHoldFluid-result.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0185-Cache-part-of-canHoldFluid-result.patch rename to leaf-server/minecraft-patches/features/0184-Cache-part-of-canHoldFluid-result.patch diff --git a/leaf-server/minecraft-patches/features/0186-Configurable-tripwire-dupe.patch b/leaf-server/minecraft-patches/features/0185-Configurable-tripwire-dupe.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0186-Configurable-tripwire-dupe.patch rename to leaf-server/minecraft-patches/features/0185-Configurable-tripwire-dupe.patch diff --git a/leaf-server/minecraft-patches/features/0187-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch b/leaf-server/minecraft-patches/features/0186-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0187-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch rename to leaf-server/minecraft-patches/features/0186-Paper-PR-Fix-MC-117075-Block-Entities-Unload-Lag-Spi.patch diff --git a/leaf-server/minecraft-patches/features/0188-Sepals-Rearrange-the-attackable-conditions.patch b/leaf-server/minecraft-patches/features/0187-Sepals-Rearrange-the-attackable-conditions.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0188-Sepals-Rearrange-the-attackable-conditions.patch rename to leaf-server/minecraft-patches/features/0187-Sepals-Rearrange-the-attackable-conditions.patch diff --git a/leaf-server/minecraft-patches/features/0189-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/leaf-server/minecraft-patches/features/0188-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0189-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to leaf-server/minecraft-patches/features/0188-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/leaf-server/minecraft-patches/features/0190-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/leaf-server/minecraft-patches/features/0189-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0190-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to leaf-server/minecraft-patches/features/0189-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/leaf-server/minecraft-patches/features/0191-Optimize-checking-nearby-players-for-spawning.patch b/leaf-server/minecraft-patches/features/0190-Optimize-checking-nearby-players-for-spawning.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0191-Optimize-checking-nearby-players-for-spawning.patch rename to leaf-server/minecraft-patches/features/0190-Optimize-checking-nearby-players-for-spawning.patch diff --git a/leaf-server/minecraft-patches/features/0192-Cache-supporting-block-check.patch b/leaf-server/minecraft-patches/features/0191-Cache-supporting-block-check.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0192-Cache-supporting-block-check.patch rename to leaf-server/minecraft-patches/features/0191-Cache-supporting-block-check.patch index 90f31d43..6ae7b61e 100644 --- a/leaf-server/minecraft-patches/features/0192-Cache-supporting-block-check.patch +++ b/leaf-server/minecraft-patches/features/0191-Cache-supporting-block-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache supporting block check diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 3a82ed1958a7686191692d9eafdc62b6d5f6fb3c..8fc75395600fec45b69e95feae201d84b72fa996 100644 +index e563b636a05a299d860a334987594dbd5c7d3511..428b2114749780770cc617d5e1aedea7f1b28b2d 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1105,12 +1105,36 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/leaf-server/minecraft-patches/features/0193-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch b/leaf-server/minecraft-patches/features/0192-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0193-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch rename to leaf-server/minecraft-patches/features/0192-Avoid-useless-deque-clear-on-LevelTicks-cleanupAfter.patch diff --git a/leaf-server/minecraft-patches/features/0194-Remove-stream-in-villagers.patch b/leaf-server/minecraft-patches/features/0193-Remove-stream-in-villagers.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0194-Remove-stream-in-villagers.patch rename to leaf-server/minecraft-patches/features/0193-Remove-stream-in-villagers.patch diff --git a/leaf-server/minecraft-patches/features/0195-Optimize-baby-villager-sensor.patch b/leaf-server/minecraft-patches/features/0194-Optimize-baby-villager-sensor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0195-Optimize-baby-villager-sensor.patch rename to leaf-server/minecraft-patches/features/0194-Optimize-baby-villager-sensor.patch diff --git a/leaf-server/minecraft-patches/features/0196-Only-player-pushable.patch b/leaf-server/minecraft-patches/features/0195-Only-player-pushable.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0196-Only-player-pushable.patch rename to leaf-server/minecraft-patches/features/0195-Only-player-pushable.patch diff --git a/leaf-server/minecraft-patches/features/0197-Remove-iterators-from-Inventory.patch b/leaf-server/minecraft-patches/features/0196-Remove-iterators-from-Inventory.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0197-Remove-iterators-from-Inventory.patch rename to leaf-server/minecraft-patches/features/0196-Remove-iterators-from-Inventory.patch diff --git a/leaf-server/minecraft-patches/features/0198-optimize-mob-despawn.patch b/leaf-server/minecraft-patches/features/0197-optimize-mob-despawn.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0198-optimize-mob-despawn.patch rename to leaf-server/minecraft-patches/features/0197-optimize-mob-despawn.patch index ce206d83..85e0ba26 100644 --- a/leaf-server/minecraft-patches/features/0198-optimize-mob-despawn.patch +++ b/leaf-server/minecraft-patches/features/0197-optimize-mob-despawn.patch @@ -38,7 +38,7 @@ index 7fb763e89e43698bfb2b9fcf6296705384e8624a..91752678f887559132921cff61697478 final net.minecraft.world.level.levelgen.BitRandomSource simpleRandom = this.simpleRandom; // Paper - optimise random ticking // Leaf - Faster random generator - upcasting ChunkPos pos = chunk.getPos(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 8fc75395600fec45b69e95feae201d84b72fa996..c9b0bc7ad989b85ad6224ef13d8cbbbe300b0606 100644 +index 428b2114749780770cc617d5e1aedea7f1b28b2d..1e7eb352143c3ff87f070a2f69a9c253d100c57c 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -5133,6 +5133,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -54,10 +54,10 @@ index 8fc75395600fec45b69e95feae201d84b72fa996..c9b0bc7ad989b85ad6224ef13d8cbbbe return Leashable.createQuadLeashOffsets(this, 0.0, 0.5, 0.5, 0.0); } diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index b22960f06f92ef4d9d12ab5b3891363534567a29..bb31b5c952152d8c6b9d3868893bb82deda5aa4d 100644 +index 751c8c17c3c2968fad358ae8807eaca54de82a34..28523643d0789c6f472dfa92c3c0a32f0bcfc7b5 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -764,6 +764,22 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -762,6 +762,22 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab } } diff --git a/leaf-server/minecraft-patches/features/0199-Slightly-optimise-getNearestPlayer.patch b/leaf-server/minecraft-patches/features/0198-Slightly-optimise-getNearestPlayer.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0199-Slightly-optimise-getNearestPlayer.patch rename to leaf-server/minecraft-patches/features/0198-Slightly-optimise-getNearestPlayer.patch diff --git a/leaf-server/minecraft-patches/features/0200-Bulk-writes-to-writeLongArray-during-chunk-loading.patch b/leaf-server/minecraft-patches/features/0199-Bulk-writes-to-writeLongArray-during-chunk-loading.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0200-Bulk-writes-to-writeLongArray-during-chunk-loading.patch rename to leaf-server/minecraft-patches/features/0199-Bulk-writes-to-writeLongArray-during-chunk-loading.patch diff --git a/leaf-server/minecraft-patches/features/0201-Improve-sorting-in-SortedArraySet.patch b/leaf-server/minecraft-patches/features/0200-Improve-sorting-in-SortedArraySet.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0201-Improve-sorting-in-SortedArraySet.patch rename to leaf-server/minecraft-patches/features/0200-Improve-sorting-in-SortedArraySet.patch diff --git a/leaf-server/minecraft-patches/features/0202-Make-removeIf-slightly-faster.patch b/leaf-server/minecraft-patches/features/0201-Make-removeIf-slightly-faster.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0202-Make-removeIf-slightly-faster.patch rename to leaf-server/minecraft-patches/features/0201-Make-removeIf-slightly-faster.patch diff --git a/leaf-server/minecraft-patches/features/0203-Optimize-LinearPalette.patch b/leaf-server/minecraft-patches/features/0202-Optimize-LinearPalette.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0203-Optimize-LinearPalette.patch rename to leaf-server/minecraft-patches/features/0202-Optimize-LinearPalette.patch diff --git a/leaf-server/minecraft-patches/features/0204-Slightly-optimized-VarInt-write.patch b/leaf-server/minecraft-patches/features/0203-Slightly-optimized-VarInt-write.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0204-Slightly-optimized-VarInt-write.patch rename to leaf-server/minecraft-patches/features/0203-Slightly-optimized-VarInt-write.patch diff --git a/leaf-server/minecraft-patches/features/0205-Rewrite-ClientboundLightUpdatePacketData.patch b/leaf-server/minecraft-patches/features/0204-Rewrite-ClientboundLightUpdatePacketData.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0205-Rewrite-ClientboundLightUpdatePacketData.patch rename to leaf-server/minecraft-patches/features/0204-Rewrite-ClientboundLightUpdatePacketData.patch diff --git a/leaf-server/minecraft-patches/features/0206-Async-chunk-sending.patch b/leaf-server/minecraft-patches/features/0205-Async-chunk-sending.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0206-Async-chunk-sending.patch rename to leaf-server/minecraft-patches/features/0205-Async-chunk-sending.patch diff --git a/leaf-server/minecraft-patches/features/0207-Spawner-Configurations.patch b/leaf-server/minecraft-patches/features/0206-Spawner-Configurations.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0207-Spawner-Configurations.patch rename to leaf-server/minecraft-patches/features/0206-Spawner-Configurations.patch diff --git a/leaf-server/minecraft-patches/features/0208-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/minecraft-patches/features/0207-SparklyPaper-Parallel-world-ticking.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0208-SparklyPaper-Parallel-world-ticking.patch rename to leaf-server/minecraft-patches/features/0207-SparklyPaper-Parallel-world-ticking.patch diff --git a/leaf-server/minecraft-patches/features/0209-SparklyPaper-Track-each-world-MSPT.patch b/leaf-server/minecraft-patches/features/0208-SparklyPaper-Track-each-world-MSPT.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0209-SparklyPaper-Track-each-world-MSPT.patch rename to leaf-server/minecraft-patches/features/0208-SparklyPaper-Track-each-world-MSPT.patch diff --git a/leaf-server/minecraft-patches/features/0210-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch b/leaf-server/minecraft-patches/features/0209-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0210-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch rename to leaf-server/minecraft-patches/features/0209-Paper-PR-Fix-cancelled-Projectile-Events-still-consu.patch diff --git a/leaf-server/minecraft-patches/features/0211-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch b/leaf-server/minecraft-patches/features/0210-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0211-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch rename to leaf-server/minecraft-patches/features/0210-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch diff --git a/leaf-server/minecraft-patches/features/0212-rewrite-InsideBrownianWalk.patch b/leaf-server/minecraft-patches/features/0211-rewrite-InsideBrownianWalk.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0212-rewrite-InsideBrownianWalk.patch rename to leaf-server/minecraft-patches/features/0211-rewrite-InsideBrownianWalk.patch diff --git a/leaf-server/minecraft-patches/features/0213-Use-BFS-on-getSlopeDistance.patch b/leaf-server/minecraft-patches/features/0212-Use-BFS-on-getSlopeDistance.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0213-Use-BFS-on-getSlopeDistance.patch rename to leaf-server/minecraft-patches/features/0212-Use-BFS-on-getSlopeDistance.patch diff --git a/leaf-server/minecraft-patches/features/0214-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/minecraft-patches/features/0213-Paper-PR-Throttle-failed-spawn-attempts.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0214-Paper-PR-Throttle-failed-spawn-attempts.patch rename to leaf-server/minecraft-patches/features/0213-Paper-PR-Throttle-failed-spawn-attempts.patch diff --git a/leaf-server/minecraft-patches/features/0215-Improve-BlockEntity-ticking-isRemoved-check.patch b/leaf-server/minecraft-patches/features/0214-Improve-BlockEntity-ticking-isRemoved-check.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0215-Improve-BlockEntity-ticking-isRemoved-check.patch rename to leaf-server/minecraft-patches/features/0214-Improve-BlockEntity-ticking-isRemoved-check.patch diff --git a/leaf-server/minecraft-patches/features/0216-Raytrace-AntiXray-SDK-integration.patch b/leaf-server/minecraft-patches/features/0215-Raytrace-AntiXray-SDK-integration.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0216-Raytrace-AntiXray-SDK-integration.patch rename to leaf-server/minecraft-patches/features/0215-Raytrace-AntiXray-SDK-integration.patch diff --git a/leaf-server/minecraft-patches/features/0217-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0216-Optimize-ContextMap.create.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0217-Optimize-ContextMap.create.patch rename to leaf-server/minecraft-patches/features/0216-Optimize-ContextMap.create.patch diff --git a/leaf-server/minecraft-patches/features/0218-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0217-Micro-optimizations-for-random-tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0218-Micro-optimizations-for-random-tick.patch rename to leaf-server/minecraft-patches/features/0217-Micro-optimizations-for-random-tick.patch diff --git a/leaf-server/minecraft-patches/features/0219-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0218-Remove-streams-on-updateConnectedPlayersWithinRange.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0219-Remove-streams-on-updateConnectedPlayersWithinRange.patch rename to leaf-server/minecraft-patches/features/0218-Remove-streams-on-updateConnectedPlayersWithinRange.patch diff --git a/leaf-server/minecraft-patches/features/0220-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0219-Remove-streams-on-PlayerDetector.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0220-Remove-streams-on-PlayerDetector.patch rename to leaf-server/minecraft-patches/features/0219-Remove-streams-on-PlayerDetector.patch diff --git a/leaf-server/minecraft-patches/features/0221-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0220-Use-direct-iteration-on-Sensing.tick.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0221-Use-direct-iteration-on-Sensing.tick.patch rename to leaf-server/minecraft-patches/features/0220-Use-direct-iteration-on-Sensing.tick.patch diff --git a/leaf-server/minecraft-patches/features/0222-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0221-Optimise-non-flush-packet-sending.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0222-Optimise-non-flush-packet-sending.patch rename to leaf-server/minecraft-patches/features/0221-Optimise-non-flush-packet-sending.patch diff --git a/leaf-server/minecraft-patches/features/0223-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0222-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0223-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch rename to leaf-server/minecraft-patches/features/0222-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch diff --git a/leaf-server/minecraft-patches/features/0224-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0223-Null-handling-on-MultifaceSpreader.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0224-Null-handling-on-MultifaceSpreader.patch rename to leaf-server/minecraft-patches/features/0223-Null-handling-on-MultifaceSpreader.patch diff --git a/leaf-server/minecraft-patches/features/0225-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0224-More-virtual-threads.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0225-More-virtual-threads.patch rename to leaf-server/minecraft-patches/features/0224-More-virtual-threads.patch diff --git a/leaf-server/minecraft-patches/features/0227-Optimize-ThreadedTicketLevelPropagator.patch b/leaf-server/minecraft-patches/features/0225-Optimize-ThreadedTicketLevelPropagator.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0227-Optimize-ThreadedTicketLevelPropagator.patch rename to leaf-server/minecraft-patches/features/0225-Optimize-ThreadedTicketLevelPropagator.patch diff --git a/leaf-server/minecraft-patches/features/0228-Optimise-MobEffectUtil-getDigSpeedAmplification.patch b/leaf-server/minecraft-patches/features/0226-Optimise-MobEffectUtil-getDigSpeedAmplification.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0228-Optimise-MobEffectUtil-getDigSpeedAmplification.patch rename to leaf-server/minecraft-patches/features/0226-Optimise-MobEffectUtil-getDigSpeedAmplification.patch diff --git a/leaf-server/minecraft-patches/features/0229-Optimise-chunkUnloads.patch b/leaf-server/minecraft-patches/features/0227-Optimise-chunkUnloads.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0229-Optimise-chunkUnloads.patch rename to leaf-server/minecraft-patches/features/0227-Optimise-chunkUnloads.patch diff --git a/leaf-server/minecraft-patches/features/0230-Optimize-BlockEntityType-isValid.patch b/leaf-server/minecraft-patches/features/0228-Optimize-BlockEntityType-isValid.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0230-Optimize-BlockEntityType-isValid.patch rename to leaf-server/minecraft-patches/features/0228-Optimize-BlockEntityType-isValid.patch diff --git a/leaf-server/minecraft-patches/features/0231-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch b/leaf-server/minecraft-patches/features/0229-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0231-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch rename to leaf-server/minecraft-patches/features/0229-Paper-PR-Add-ticket-on-player-join-to-avoid-chunk-lo.patch diff --git a/leaf-server/minecraft-patches/features/0232-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch b/leaf-server/minecraft-patches/features/0230-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0232-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch rename to leaf-server/minecraft-patches/features/0230-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch diff --git a/leaf-server/minecraft-patches/features/0233-Sakura-copy-EntityList-implementation-to-BasicEntity.patch b/leaf-server/minecraft-patches/features/0231-Sakura-copy-EntityList-implementation-to-BasicEntity.patch similarity index 90% rename from leaf-server/minecraft-patches/features/0233-Sakura-copy-EntityList-implementation-to-BasicEntity.patch rename to leaf-server/minecraft-patches/features/0231-Sakura-copy-EntityList-implementation-to-BasicEntity.patch index 21faa1dd..9b2c9ad6 100644 --- a/leaf-server/minecraft-patches/features/0233-Sakura-copy-EntityList-implementation-to-BasicEntity.patch +++ b/leaf-server/minecraft-patches/features/0231-Sakura-copy-EntityList-implementation-to-BasicEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Sakura: copy EntityList implementation to BasicEntityList diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java -index 9a2539e1fe2cee30066634ef47a991fa5837a5e4..5ebc1b2cf186b512da5b62fedba16b612f2fa6ed 100644 +index fee4a7452178c274eb835d758b718d8e874d79d0..7f508c50e451a0689218cd36e6ac993f87092c04 100644 --- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java +++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java -@@ -437,6 +437,13 @@ public final class ChunkEntitySlices { +@@ -404,6 +404,13 @@ public final class ChunkEntitySlices { private E[] storage; private int size; @@ -22,7 +22,7 @@ index 9a2539e1fe2cee30066634ef47a991fa5837a5e4..5ebc1b2cf186b512da5b62fedba16b61 public BasicEntityList() { this(0); -@@ -457,6 +464,7 @@ public final class ChunkEntitySlices { +@@ -424,6 +431,7 @@ public final class ChunkEntitySlices { private void resize() { if (this.storage == me.titaniumtown.ArrayConstants.emptyEntityArray) { // Gale - JettPack - reduce array allocations this.storage = (E[])new Entity[DEFAULT_CAPACITY]; @@ -30,7 +30,7 @@ index 9a2539e1fe2cee30066634ef47a991fa5837a5e4..5ebc1b2cf186b512da5b62fedba16b61 } else { this.storage = Arrays.copyOf(this.storage, this.storage.length * 2); } -@@ -470,6 +478,7 @@ public final class ChunkEntitySlices { +@@ -437,6 +445,7 @@ public final class ChunkEntitySlices { } else { this.storage[idx] = entity; } @@ -38,7 +38,7 @@ index 9a2539e1fe2cee30066634ef47a991fa5837a5e4..5ebc1b2cf186b512da5b62fedba16b61 } public int indexOf(final E entity) { -@@ -485,24 +494,32 @@ public final class ChunkEntitySlices { +@@ -452,24 +461,32 @@ public final class ChunkEntitySlices { } public boolean remove(final E entity) { diff --git a/leaf-server/minecraft-patches/features/0234-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0232-Protocol-Core.patch similarity index 96% rename from leaf-server/minecraft-patches/features/0234-Protocol-Core.patch rename to leaf-server/minecraft-patches/features/0232-Protocol-Core.patch index c3565e55..d60a5a59 100644 --- a/leaf-server/minecraft-patches/features/0234-Protocol-Core.patch +++ b/leaf-server/minecraft-patches/features/0232-Protocol-Core.patch @@ -22,10 +22,10 @@ index 56fd1ed7ccaf96e7eedea60fbdbf7f934939d563..d2f522ea6d0a209496848af073c9af1c } diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index cf1f876c6caf1cb954749331fdeb6573f733c754..7849a905db35377da0931aa1c9b8770f30a51044 100644 +index 01da8faee1bc8d656949106d5f88dea0c1ebfc89..926d0cf31be80fe1298c14411e65cd39a0962b32 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1804,6 +1804,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pushableEntities = org.dreeam.leaf.config.modules.gameplay.OnlyPlayerPushable.enabled @@ -19,10 +19,10 @@ index d745fd544263b364c1880220c076be41f269a8b7..a55b1534dc3c0745ff569f5c1e07dbea // Leaf end - Only player pushable if (!pushableEntities.isEmpty()) { diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java -index 72f2613c08f251bf32586d9fd039fdca80f6df02..2a1c89bb6712c97ad48b9f64c26f36afe8c811e4 100644 +index 38a6ca1c0789e50ca15f7a5e602da9be5f8371e9..afebf43067f13493d06e6c0620058c135eb9b880 100644 --- a/net/minecraft/world/level/Level.java +++ b/net/minecraft/world/level/Level.java -@@ -1909,7 +1909,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl +@@ -1907,7 +1907,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup, AutoCl // Paper end - rewrite chunk system public List getPushableEntities(Entity entity, AABB boundingBox) { diff --git a/leaf-server/minecraft-patches/features/0269-Skip-inactive-entity-for-execute.patch b/leaf-server/minecraft-patches/features/0267-Skip-inactive-entity-for-execute.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0269-Skip-inactive-entity-for-execute.patch rename to leaf-server/minecraft-patches/features/0267-Skip-inactive-entity-for-execute.patch diff --git a/leaf-server/minecraft-patches/features/0270-Optimise-getEntities.patch b/leaf-server/minecraft-patches/features/0268-Optimise-getEntities.patch similarity index 91% rename from leaf-server/minecraft-patches/features/0270-Optimise-getEntities.patch rename to leaf-server/minecraft-patches/features/0268-Optimise-getEntities.patch index 9e6bc9c7..4500d418 100644 --- a/leaf-server/minecraft-patches/features/0270-Optimise-getEntities.patch +++ b/leaf-server/minecraft-patches/features/0268-Optimise-getEntities.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Optimise-getEntities Co-authored by: Martijn Muijsers diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java -index 5ebc1b2cf186b512da5b62fedba16b612f2fa6ed..14dc37f0ed08b4eb4c7740ec68d23df0060c0955 100644 +index 7f508c50e451a0689218cd36e6ac993f87092c04..8c77623ca06139883b12690bdde3c79ce99f6049 100644 --- a/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java +++ b/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java -@@ -579,6 +579,14 @@ public final class ChunkEntitySlices { +@@ -546,6 +546,14 @@ public final class ChunkEntitySlices { final BasicEntityList[] entitiesBySection = this.entitiesBySection; @@ -24,7 +24,7 @@ index 5ebc1b2cf186b512da5b62fedba16b612f2fa6ed..14dc37f0ed08b4eb4c7740ec68d23df0 for (int section = min; section <= max; ++section) { final BasicEntityList list = entitiesBySection[section - minSection]; -@@ -587,11 +595,18 @@ public final class ChunkEntitySlices { +@@ -554,11 +562,18 @@ public final class ChunkEntitySlices { } final Entity[] storage = list.storage; @@ -45,7 +45,7 @@ index 5ebc1b2cf186b512da5b62fedba16b612f2fa6ed..14dc37f0ed08b4eb4c7740ec68d23df0 continue; } -@@ -618,19 +633,32 @@ public final class ChunkEntitySlices { +@@ -585,19 +600,32 @@ public final class ChunkEntitySlices { final BasicEntityList[] entitiesBySection = this.entitiesBySection; @@ -82,10 +82,10 @@ index 5ebc1b2cf186b512da5b62fedba16b612f2fa6ed..14dc37f0ed08b4eb4c7740ec68d23df0 } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index a55b1534dc3c0745ff569f5c1e07dbeaba0fe57d..1dbfbb0e56757c0ab6785755afc485055a87c327 100644 +index 33dabdec3e62d766583ed2482a688d6001ae7e8f..152c85513b7c4c7df61747cfad977a617a80080e 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -2282,7 +2282,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -2276,7 +2276,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @Override public boolean isAlive() { diff --git a/leaf-server/minecraft-patches/features/0271-fix-MC-298464.patch b/leaf-server/minecraft-patches/features/0269-fix-MC-298464.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0271-fix-MC-298464.patch rename to leaf-server/minecraft-patches/features/0269-fix-MC-298464.patch diff --git a/leaf-server/minecraft-patches/features/0272-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch b/leaf-server/minecraft-patches/features/0270-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0272-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch rename to leaf-server/minecraft-patches/features/0270-Re-route-SetClosestHomeAsWalkTarget-s-poi-finding-to.patch diff --git a/leaf-server/minecraft-patches/features/0273-optimize-checkInsideBlocks-calls.patch b/leaf-server/minecraft-patches/features/0271-optimize-checkInsideBlocks-calls.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0273-optimize-checkInsideBlocks-calls.patch rename to leaf-server/minecraft-patches/features/0271-optimize-checkInsideBlocks-calls.patch diff --git a/leaf-server/minecraft-patches/features/0274-Op-lock.patch b/leaf-server/minecraft-patches/features/0272-Op-lock.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0274-Op-lock.patch rename to leaf-server/minecraft-patches/features/0272-Op-lock.patch diff --git a/leaf-server/minecraft-patches/features/0275-Custom-NonNullList.patch b/leaf-server/minecraft-patches/features/0273-Custom-NonNullList.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0275-Custom-NonNullList.patch rename to leaf-server/minecraft-patches/features/0273-Custom-NonNullList.patch diff --git a/leaf-server/minecraft-patches/features/0276-Optimise-TextColor.patch b/leaf-server/minecraft-patches/features/0274-Optimise-TextColor.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0276-Optimise-TextColor.patch rename to leaf-server/minecraft-patches/features/0274-Optimise-TextColor.patch diff --git a/leaf-server/minecraft-patches/features/0277-Do-not-create-fire-if-explosion-was-cancelled.patch b/leaf-server/minecraft-patches/features/0275-Do-not-create-fire-if-explosion-was-cancelled.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0277-Do-not-create-fire-if-explosion-was-cancelled.patch rename to leaf-server/minecraft-patches/features/0275-Do-not-create-fire-if-explosion-was-cancelled.patch diff --git a/leaf-server/minecraft-patches/features/0278-Skip-BlockPhysicsEvent-if-no-listeners.patch b/leaf-server/minecraft-patches/features/0276-Skip-BlockPhysicsEvent-if-no-listeners.patch similarity index 100% rename from leaf-server/minecraft-patches/features/0278-Skip-BlockPhysicsEvent-if-no-listeners.patch rename to leaf-server/minecraft-patches/features/0276-Skip-BlockPhysicsEvent-if-no-listeners.patch diff --git a/leaf-server/minecraft-patches/features/0279-Lithium-equipment-tracking.patch b/leaf-server/minecraft-patches/features/0277-Lithium-equipment-tracking.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0279-Lithium-equipment-tracking.patch rename to leaf-server/minecraft-patches/features/0277-Lithium-equipment-tracking.patch index f4370285..59c845b6 100644 --- a/leaf-server/minecraft-patches/features/0279-Lithium-equipment-tracking.patch +++ b/leaf-server/minecraft-patches/features/0277-Lithium-equipment-tracking.patch @@ -241,7 +241,7 @@ index 90814ad07a2686c5a274860395f5aca29cc3bf13..94c7ae9535a235abb8fddf0ca6578dfa + } } diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 1dbfbb0e56757c0ab6785755afc485055a87c327..862d4f62c73e8e488acb4ec5fff388990ca56083 100644 +index 152c85513b7c4c7df61747cfad977a617a80080e..8b4e1ec94a1a206b0682cee5044878af4fc8ba9d 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -431,7 +431,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @@ -253,7 +253,7 @@ index 1dbfbb0e56757c0ab6785755afc485055a87c327..862d4f62c73e8e488acb4ec5fff38899 EnchantmentHelper.tickEffects(serverLevel, this); } -@@ -3464,6 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3458,6 +3458,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin public void detectEquipmentUpdates() { Map map = this.collectEquipmentChanges(); if (map != null) { @@ -261,7 +261,7 @@ index 1dbfbb0e56757c0ab6785755afc485055a87c327..862d4f62c73e8e488acb4ec5fff38899 this.handleHandSwap(map); if (!map.isEmpty()) { this.handleEquipmentChanges(map); -@@ -3473,6 +3474,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -3467,6 +3468,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin @Nullable private Map collectEquipmentChanges() { diff --git a/leaf-server/minecraft-patches/features/0280-fix-purpur-attribute-base-patch.patch b/leaf-server/minecraft-patches/features/0278-fix-purpur-attribute-base-patch.patch similarity index 98% rename from leaf-server/minecraft-patches/features/0280-fix-purpur-attribute-base-patch.patch rename to leaf-server/minecraft-patches/features/0278-fix-purpur-attribute-base-patch.patch index 3aeb2db9..41478645 100644 --- a/leaf-server/minecraft-patches/features/0280-fix-purpur-attribute-base-patch.patch +++ b/leaf-server/minecraft-patches/features/0278-fix-purpur-attribute-base-patch.patch @@ -18,10 +18,10 @@ index 86a694b94045b47f6e98c480645f75738b8a052c..bb9554463a6983ab98323f4dd665c7c1 // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 862d4f62c73e8e488acb4ec5fff388990ca56083..ff1195351cc7452fe114e1d4b04bb97cd12751b9 100644 +index 8b4e1ec94a1a206b0682cee5044878af4fc8ba9d..1057bd5e086d74bb28d1aab219f46e0837eb20f9 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -2859,6 +2859,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin +@@ -2853,6 +2853,16 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin return this.getAttributes().getBaseValue(attribute); } @@ -162,7 +162,7 @@ index c4fda92e078c9ba745b2548ecaaffffff97fb0fd..c683455e7500b18a99f3e88d1d4b5792 // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/animal/Fox.java b/net/minecraft/world/entity/animal/Fox.java -index a22ccaab0f4d6e3a69080b56f8042010403378cf..3b0b0afe8ad84ab4a35134ba12c1ecb0ebfde21a 100644 +index 8964bb5098c0dc36741af3656af6bc0b5b463abe..619e7ec6ccfc076cd483a7215ab80e6bf4aaad83 100644 --- a/net/minecraft/world/entity/animal/Fox.java +++ b/net/minecraft/world/entity/animal/Fox.java @@ -183,8 +183,8 @@ public class Fox extends Animal { @@ -245,7 +245,7 @@ index 4c20569ec5c504c582575851ab1d74248289b1c0..c83d47caf8572e7f1375829f7dcb1b3b // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/animal/Panda.java b/net/minecraft/world/entity/animal/Panda.java -index 8b37cbae45916227b99c7dae4da5f0c0e3144619..e596564c17acf5ad1dc45a296e9fa9c54c3a1e15 100644 +index 02bfa88568e635770675ea9173f2cf3ca21457fa..c4cfcab5be629e83c0418bcb9ef1062bc8459af9 100644 --- a/net/minecraft/world/entity/animal/Panda.java +++ b/net/minecraft/world/entity/animal/Panda.java @@ -136,9 +136,8 @@ public class Panda extends Animal { @@ -319,7 +319,7 @@ index 685176ce37538cbbc614401db568acdb0ad264bb..7c6ccac4ae5de741753a6e75936416b1 // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/animal/Rabbit.java b/net/minecraft/world/entity/animal/Rabbit.java -index aae1e9691725e40864764c0ad3862a35cce0a6d9..b326bda9206bbe4b8bd617e14103f484e30df5c8 100644 +index 041ccb96d36cbe0f5683ff6e8b2adb0b79a96738..c0a63a8d1a3c33d9d151aaf3131ea583f4f48588 100644 --- a/net/minecraft/world/entity/animal/Rabbit.java +++ b/net/minecraft/world/entity/animal/Rabbit.java @@ -148,8 +148,8 @@ public class Rabbit extends Animal { @@ -390,7 +390,7 @@ index 8d1fa86c6f4881c05f11fa80018b8de7f4920006..35d6f1f8582b94c808594f5f8dbd3ca4 // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/animal/Turtle.java b/net/minecraft/world/entity/animal/Turtle.java -index 98131b65eaaa5e20b8f4e8d022141140b70521ca..96ca212d39c87d55c772356cb84da06b32a1af99 100644 +index 9bdc1f10e3b40672449ad166f130ecabdacc75d3..0065a43871605c8d2a8b29d1aed174aeed8be3b2 100644 --- a/net/minecraft/world/entity/animal/Turtle.java +++ b/net/minecraft/world/entity/animal/Turtle.java @@ -106,8 +106,8 @@ public class Turtle extends Animal { @@ -523,7 +523,7 @@ index 1f545d4c9a3de0d6630a92481920ed6c3553ce97..eddf4ece4ba06d1f6e8c2ff80c81629c // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java -index 96016902084a94a98c850579ec7714264a23b781..248de76481813ed8359db09f14abc174c6b481e9 100644 +index 7e7cb9db1c84bdb173b444bec90663a93fb3b549..5d3fd6a6ce2eb3c462bfb10abdc817a114821ca1 100644 --- a/net/minecraft/world/entity/animal/wolf/Wolf.java +++ b/net/minecraft/world/entity/animal/wolf/Wolf.java @@ -211,8 +211,8 @@ public class Wolf extends TamableAnimal implements NeutralMob { @@ -626,7 +626,7 @@ index 2839c755e5ca58896bc14f95ce4889d48ec415b3..9bcfd34ab0de8f3c12d01a9f26a97311 // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/monster/Drowned.java b/net/minecraft/world/entity/monster/Drowned.java -index c21519490433dfb2da3435afe757df01747c98e5..b57fdb8c28c32e7d67e9f5c2d3fa77f49bc66432 100644 +index 7ff380212ce5e56e0e58e5f52f8c75bda5061ef0..85c095cd384965789e3146493f6017154d5a4995 100644 --- a/net/minecraft/world/entity/monster/Drowned.java +++ b/net/minecraft/world/entity/monster/Drowned.java @@ -96,9 +96,9 @@ public class Drowned extends Zombie implements RangedAttackMob { @@ -891,7 +891,7 @@ index e69a5c552d2f57bc373cb2b89690a7dd9c2faefc..cfbb89f278e84d39a2b412fb72d7114d // Purpur end - Configurable entity base attributes diff --git a/net/minecraft/world/entity/monster/Strider.java b/net/minecraft/world/entity/monster/Strider.java -index af9f07f7bcdd75dfa0dff975afcd30476ec5b206..d7acfa0bda8a34ab6de1bf79df3a892b997a827c 100644 +index 31cace20dfd61bd591f501d840a190799808926f..4a4f3ed5dbc6b1934b2901c3a21597ba783b1806 100644 --- a/net/minecraft/world/entity/monster/Strider.java +++ b/net/minecraft/world/entity/monster/Strider.java @@ -112,8 +112,8 @@ public class Strider extends Animal implements ItemSteerable { diff --git a/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java b/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java index d11ccdc8..10d97215 100644 --- a/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java +++ b/leaf-server/src/main/java/org/dreeam/leaf/async/ShutdownExecutors.java @@ -3,7 +3,6 @@ package org.dreeam.leaf.async; import net.minecraft.server.MinecraftServer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.dreeam.leaf.async.ai.AsyncGoalThread; import org.dreeam.leaf.async.locate.AsyncLocator; import org.dreeam.leaf.async.path.AsyncPathProcessor; import org.dreeam.leaf.async.tracker.AsyncTracker; @@ -32,15 +31,6 @@ public class ShutdownExecutors { } } - if (server.asyncGoalThread != null) { - LOGGER.info("Waiting for mob target finding thread to shutdown..."); - AsyncGoalThread.RUNNING = false; - try { - server.asyncGoalThread.join(3000L); - } catch (InterruptedException ignored) { - } - } - if (AsyncTracker.TRACKER_EXECUTOR != null) { LOGGER.info("Waiting for entity tracker executor to shutdown..."); AsyncTracker.TRACKER_EXECUTOR.shutdown();