Skip to content

Event-driven Entity.isIntickList #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartijnMuijsers merged 1 commit into from
Jul 6, 2026
Merged

Event-driven Entity.isIntickList #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions gale-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,12 @@
entity.totalEntityAge++; // Paper - age-like counter for all entities
profiler.push(entity.typeHolder()::getRegisteredName);
profiler.incrementCounter("tickNonPassenger");
@@ -1423,7 +_,7 @@
@@ -1421,9 +_,9 @@
private void tickPassenger(final Entity vehicle, final Entity entity, final boolean isActive) { // Paper - EAR 2
if (entity.isRemoved() || entity.getVehicle() != vehicle) {
entity.stopRiding();
} else if (entity instanceof Player || this.entityTickList.contains(entity)) {
- } else if (entity instanceof Player || this.entityTickList.contains(entity)) {
+ } else if (entity instanceof Player || entity.gale$eventDriven_isInTickList) { // Gale - Event-driven - Entity.isInTickList
entity.setOldPosAndRot();
- entity.tickCount++;
+ entity.setTickCount(entity.tickCount + 1); // Gale - Event-driven - Cat.canRemoveWhenFarAway, Ocelot.canRemoveWhenFarAway
Expand Down
10 changes: 9 additions & 1 deletion gale-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
// CraftBukkit start - block invalid bounding boxes
double minX = bb.minX,
minY = bb.minY,
@@ -4718,13 +_,35 @@
@@ -4718,13 +_,43 @@
}

public int countPlayerPassengers() {
Expand Down Expand Up @@ -231,6 +231,14 @@
+ return this.gale$eventDriven_playerPassengerCount == 0;
+ }
+ // Gale end - Event-driven - Entity.playerPassengerCount
+
+ // Gale start - Event-driven - Entity.isInTickList
+ public boolean gale$eventDriven_isInTickList;
+
+ public void gale$eventDriven_isInTickList_set(boolean newValue) {
+ this.gale$eventDriven_isInTickList = newValue;
+ }
+ // Gale end - Event-driven - Entity.isInTickList

public Entity getRootVehicle() {
Entity result = this;
Expand Down
13 changes: 11 additions & 2 deletions gale-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
return toEquip;
} else {
return ItemStack.EMPTY;
@@ -780,38 +_,187 @@
@@ -780,38 +_,198 @@
return true;
}

Expand Down Expand Up @@ -206,14 +206,23 @@
+ }
+
+ private byte gale$eventDriven_checkDespawnPlayerTrackingMode_compute() {
+ if (this.gale$eventDriven_mustDespawnBecauseOfPeacefulDifficulty || this.gale$eventDriven_isPersistent || this.level().gale$eventDriven_affectsSpawningSelectorPlayerCount == 0) {
+ if (!this.gale$eventDriven_isInTickList || this.gale$eventDriven_mustDespawnBecauseOfPeacefulDifficulty || this.gale$eventDriven_isPersistent || this.level().gale$eventDriven_affectsSpawningSelectorPlayerCount == 0) {
+ return 0;
+ } else if (!this.gale$canRemoveWhenFarAway()) {
+ return 1;
+ } else {
+ return 2;
+ }
+ }
+
+ @Override
+ public void gale$eventDriven_isInTickList_set(boolean newValue) {
+ boolean oldValue = this.gale$eventDriven_isInTickList;
+ if (oldValue != newValue) {
+ super.gale$eventDriven_isInTickList_set(newValue);
+ this.gale$eventDriven_checkDespawnPlayerTrackingMode_update();
+ }
+ }
+ // Gale end - Optimize Mob.checkDespawn
+
@Override
Expand Down
16 changes: 16 additions & 0 deletions ...rver/minecraft-patches/sources/net/minecraft/world/level/entity/EntityTickList.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- a/net/minecraft/world/level/entity/EntityTickList.java
+++ b/net/minecraft/world/level/entity/EntityTickList.java
@@ -18,11 +_,13 @@
public void add(final Entity entity) {
this.ensureActiveIsNotIterated();
this.entities.add(entity); // Paper - rewrite chunk system
+ entity.gale$eventDriven_isInTickList_set(true); // Gale - Event-driven - Entity.isInTickList
}

public void remove(final Entity entity) {
this.ensureActiveIsNotIterated();
this.entities.remove(entity); // Paper - rewrite chunk system
+ entity.gale$eventDriven_isInTickList_set(false); // Gale - Event-driven - Entity.isInTickList
}

public boolean contains(final Entity entity) {
Loading