Separate tick count to ensure vanilla parity #12077
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lynxplay
approved these changes
Feb 8, 2025
NoahvdAa
reviewed
Feb 9, 2025
paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
Outdated
Show resolved
Hide resolved
lynxplay
force-pushed
the
fix/entity-behavior-parity
branch
from
9254a91 to
f28a08b
Compare
NoahvdAa
approved these changes
Feb 9, 2025
Warriorrrr
reviewed
Feb 10, 2025
| @@ -860,7 +861,7 @@ | |||
| + // CraftBukkit start | |||
| + // Spigot start | |||
| + if (this instanceof net.minecraft.world.entity.LivingEntity) { | |||
| + this.tickCount = compound.getInt("Spigot.ticksLived"); | |||
| + this.totalEntityAge = compound.getInt("Spigot.ticksLived"); // Paper | |||
There was a problem hiding this comment.
Kinda unrelated to this PR but, is there still a reason to only read this if the entity is a living entity?
There was a problem hiding this comment.
Entity despawn now uses the totalEntityAge
There was a problem hiding this comment.
Kinda unrelated to this PR but, is there still a reason to only read this if the entity is a living entity?
Spigot api resets tickCount for non-living entities, so leaving it here just for api behavior is same as spigot.
Owen1212055
approved these changes
Feb 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12075.
This pull request introduces another entity tick counter
totalTickCountfor api usage, reset vanillatickCountinstead of restoring value from Spigot'sSpigot.ticksLivedtag to keep vanilla parity.Analysis
Spigot's restore tickCount behavior(See original patch) causes potential issues with Wither's ai, see code below, and lead to wither loses its target when entities are reloaded:
Api Changes
Now
Entity#getTicksLivedgets value from totalTickCount to avoid api behavior breakage,Entity#setTicksLivedsets bothtickCountandtotalTickCount.Currently the totalTickCount is only used for apis, if the breakage is fine, the extra counter can be removed.