2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: AJMFactsheets <AJMFactsheets@gmail.com>
|
|
|
|
Date: Fri, 17 Jan 2020 17:17:54 -0600
|
|
|
|
Subject: [PATCH] Fix items not falling correctly
|
|
|
|
|
|
|
|
Since 1.14, Mojang has added an optimization which skips checking if
|
|
|
|
an item should fall every fourth tick.
|
|
|
|
|
|
|
|
However, Spigot's entity activation range class also has an
|
|
|
|
optimization which skips ticking active entities every fourth tick.
|
|
|
|
This can result in a state where an item will never properly fall
|
|
|
|
due to its move method never being called.
|
|
|
|
|
2022-01-19 20:18:24 +01:00
|
|
|
This patch resolves the conflict by offsetting checking Spigot's entity
|
|
|
|
activation range check from an item's move method.
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
2024-09-19 16:36:07 +02:00
|
|
|
index f9dfd6e7b610cfee75524a525ab0e72bed5522da..e110296a95441a13ec431d897796326b0277edb1 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
2024-09-19 16:36:07 +02:00
|
|
|
@@ -175,7 +175,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-06-07 23:14:56 +02:00
|
|
|
- if (!this.onGround() || this.getDeltaMovement().horizontalDistanceSqr() > 9.999999747378752E-6D || (this.tickCount + this.getId()) % 4 == 0) {
|
|
|
|
+ if (!this.onGround() || this.getDeltaMovement().horizontalDistanceSqr() > 9.999999747378752E-6D || (this.tickCount + this.getId()) % 4 == 0) { // Paper - Diff on change
|
2021-06-11 14:02:28 +02:00
|
|
|
this.move(MoverType.SELF, this.getDeltaMovement());
|
2024-04-24 08:05:14 +02:00
|
|
|
float f = 0.98F;
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2022-01-19 20:18:24 +01:00
|
|
|
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
2024-04-07 01:50:43 +02:00
|
|
|
index 6d51464f6368151e8acc532414ee223714584e96..9fb9fa62c32445ac3c3883a6433759c86dcfc428 100644
|
2022-01-19 20:18:24 +01:00
|
|
|
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
2024-04-07 01:50:43 +02:00
|
|
|
@@ -256,7 +256,7 @@ public class ActivationRange
|
2022-01-19 20:18:24 +01:00
|
|
|
isActive = true;
|
|
|
|
}
|
|
|
|
// Add a little performance juice to active entities. Skip 1/4 if not immune.
|
|
|
|
- } else if ( !entity.defaultActivationState && entity.tickCount % 4 == 0 && !ActivationRange.checkEntityImmunities( entity ) )
|
2023-01-07 13:05:13 +01:00
|
|
|
+ } else if ( !entity.defaultActivationState && (entity.tickCount + entity.getId()) % 4 == 0 && !ActivationRange.checkEntityImmunities( entity ) ) // Paper - Ensure checking item movement is offset from Spigot's entity activation range check
|
2022-01-19 20:18:24 +01:00
|
|
|
{
|
|
|
|
isActive = false;
|
|
|
|
}
|