diff --git a/patches/server/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch index 32683cc..366628f 100644 --- a/patches/server/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch +++ b/patches/server/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch @@ -6,8 +6,9 @@ Subject: [PATCH] Reduce lambda and Optional allocation in License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) -This patch is based on the following commit: -"new: remove lambda allocation in EntityExplosionBehavior" +This patch is based on the following mixin: +"alloc/explosion_behavior/EntityExplosionBehaviorMixin" +Original commit: "new: remove lambda allocation in EntityExplosionBehavior" By: 2No2Name <2No2Name@web.de> As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.nl.html) diff --git a/patches/server/0065-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0065-Replace-AI-goal-set-with-optimized-collection.patch index 8b19690..d1ce64c 100644 --- a/patches/server/0065-Replace-AI-goal-set-with-optimized-collection.patch +++ b/patches/server/0065-Replace-AI-goal-set-with-optimized-collection.patch @@ -5,8 +5,9 @@ Subject: [PATCH] Replace AI goal set with optimized collection License: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) -This patch is based on the following commit: -"new: replace AI goal set with optimized collection" +This patch is based on the following mixin: +"collections/goals/GoalSelectorMixin" +Original commit: "new: replace AI goal set with optimized collection" By: 2No2Name <2No2Name@web.de> As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.nl.html) diff --git a/patches/server/0066-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0066-Skip-entity-move-if-movement-is-zero.patch new file mode 100644 index 0000000..cad65b1 --- /dev/null +++ b/patches/server/0066-Skip-entity-move-if-movement-is-zero.patch @@ -0,0 +1,50 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Wed, 30 Nov 2022 14:25:58 +0100 +Subject: [PATCH] Skip entity move if movement is zero + +License: MIT (https://opensource.org/licenses/MIT) + +This patch is based on the following mixin: +"entity/move_zero_velocity/MixinEntity" +Original commit: "Performance: Ignore zero velocity movement" +By: ishland +As part of: VMP (https://github.com/RelativityMC/VMP-fabric) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index c73f2a697bcb4a670df37879dfc3e140290325bd..aa3b6f085e370079883d9928962bff8e9b187246 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -299,6 +299,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + public float yRotO; + public float xRotO; + private AABB bb; ++ private boolean boundingBoxChanged = false; // Gale - VMP - skip entity move if movement is zero + public boolean onGround; + public boolean horizontalCollision; + public boolean verticalCollision; +@@ -1023,6 +1024,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + // Paper end - detailed watchdog information + + public void move(MoverType movementType, Vec3 movement) { ++ // Gale start - VMP - skip entity move if movement is zero ++ if (!this.boundingBoxChanged && movement.equals(Vec3.ZERO)) { ++ return; ++ } ++ // Gale end - VMP - skip entity move if movement is zero + // Paper start - detailed watchdog information + io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main"); + synchronized (this.posLock) { +@@ -3750,6 +3756,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + } + + public final void setBoundingBox(AABB boundingBox) { ++ // Gale start - VMP - skip entity move if movement is zero ++ if (!this.bb.equals(boundingBox)) { ++ this.boundingBoxChanged = true; ++ } ++ // Gale end - VMP - skip entity move if movement is zero + // CraftBukkit start - block invalid bounding boxes + double minX = boundingBox.minX, + minY = boundingBox.minY, diff --git a/patches/server/0066-Player-canSee-by-entity-UUID.patch b/patches/server/0067-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0066-Player-canSee-by-entity-UUID.patch rename to patches/server/0067-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0067-Spread-out-sending-all-player-info.patch b/patches/server/0068-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0067-Spread-out-sending-all-player-info.patch rename to patches/server/0068-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0068-Optimize-player-list-for-sending-player-info.patch b/patches/server/0069-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0068-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0069-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0069-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0070-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0069-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0070-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0070-Send-multiple-keep-alive-packets.patch b/patches/server/0071-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0070-Send-multiple-keep-alive-packets.patch rename to patches/server/0071-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0071-Specific-interval-TPS-API.patch b/patches/server/0072-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0071-Specific-interval-TPS-API.patch rename to patches/server/0072-Specific-interval-TPS-API.patch diff --git a/patches/server/0072-5-second-TPS-average.patch b/patches/server/0073-5-second-TPS-average.patch similarity index 100% rename from patches/server/0072-5-second-TPS-average.patch rename to patches/server/0073-5-second-TPS-average.patch diff --git a/patches/server/0073-Measure-last-tick-time.patch b/patches/server/0074-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0073-Measure-last-tick-time.patch rename to patches/server/0074-Measure-last-tick-time.patch diff --git a/patches/server/0074-Last-tick-time-API.patch b/patches/server/0075-Last-tick-time-API.patch similarity index 100% rename from patches/server/0074-Last-tick-time-API.patch rename to patches/server/0075-Last-tick-time-API.patch diff --git a/patches/server/0075-Show-last-tick-time-in-tps-command.patch b/patches/server/0076-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0075-Show-last-tick-time-in-tps-command.patch rename to patches/server/0076-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0076-Collision-physics-check-before-vehicle-check.patch b/patches/server/0077-Collision-physics-check-before-vehicle-check.patch similarity index 90% rename from patches/server/0076-Collision-physics-check-before-vehicle-check.patch rename to patches/server/0077-Collision-physics-check-before-vehicle-check.patch index 1deeb52..7cdd56b 100644 --- a/patches/server/0076-Collision-physics-check-before-vehicle-check.patch +++ b/patches/server/0077-Collision-physics-check-before-vehicle-check.patch @@ -15,10 +15,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c73f2a697bcb4a670df37879dfc3e140290325bd..6f8b83016a81e376053f865f71e65bea125e3727 100644 +index aa3b6f085e370079883d9928962bff8e9b187246..4d17a2c8235bb897a9acecbc71df364b76613b75 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1958,8 +1958,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1964,8 +1964,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void playerTouch(Player player) {} public void push(Entity entity) { diff --git a/patches/server/0077-Variable-main-thread-task-delay.patch b/patches/server/0078-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0077-Variable-main-thread-task-delay.patch rename to patches/server/0078-Variable-main-thread-task-delay.patch diff --git a/patches/server/0078-Reduce-RandomSource-instances.patch b/patches/server/0079-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0078-Reduce-RandomSource-instances.patch rename to patches/server/0079-Reduce-RandomSource-instances.patch diff --git a/patches/server/0079-CPU-cores-estimation.patch b/patches/server/0080-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0079-CPU-cores-estimation.patch rename to patches/server/0080-CPU-cores-estimation.patch diff --git a/patches/server/0080-Add-centralized-AsyncExecutor.patch b/patches/server/0081-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0080-Add-centralized-AsyncExecutor.patch rename to patches/server/0081-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0081-Remove-Paper-async-executor.patch b/patches/server/0082-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0081-Remove-Paper-async-executor.patch rename to patches/server/0082-Remove-Paper-async-executor.patch diff --git a/patches/server/0082-Remove-Paper-cleaner-executor.patch b/patches/server/0083-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0082-Remove-Paper-cleaner-executor.patch rename to patches/server/0083-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0083-Remove-background-executor.patch b/patches/server/0084-Remove-background-executor.patch similarity index 100% rename from patches/server/0083-Remove-background-executor.patch rename to patches/server/0084-Remove-background-executor.patch diff --git a/patches/server/0084-Remove-bootstrap-executor.patch b/patches/server/0085-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0084-Remove-bootstrap-executor.patch rename to patches/server/0085-Remove-bootstrap-executor.patch diff --git a/patches/server/0085-Remove-world-upgrade-executors.patch b/patches/server/0086-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0085-Remove-world-upgrade-executors.patch rename to patches/server/0086-Remove-world-upgrade-executors.patch diff --git a/patches/server/0086-Remove-tab-complete-executor.patch b/patches/server/0087-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0086-Remove-tab-complete-executor.patch rename to patches/server/0087-Remove-tab-complete-executor.patch diff --git a/patches/server/0087-Remove-text-filter-executor.patch b/patches/server/0088-Remove-text-filter-executor.patch similarity index 100% rename from patches/server/0087-Remove-text-filter-executor.patch rename to patches/server/0088-Remove-text-filter-executor.patch