OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove wall-time / unused skip tick protection

Browse source 
Spigot still maintains some partial implementation of "tick skipping", a
practice in which the MinecraftServer.currentTick field is updated not
by an increment of one per actual tick, but instead set to
System.currentTimeMillis() / 50. This behaviour means that the tracked
tick may "skip" a tick value in case a previous tick took more than the
expected 50ms.

To compensate for this in important paths, spigot/craftbukkit
implements "wall-time". Instead of incrementing/decrementing ticks on
block entities/entities by one for each call to their tick() method,
they instead increment/decrement important values, like
an ItemEntity's age or pickupDelay, by the difference of
`currentTick - lastTick`, where `lastTick` is the value of
`currentTick` during the last tick() call.

These "fixes" however do not play nicely with minecraft's simulation
distance as entities/block entities implementing the above behaviour
would "catch up" their values when moving from a non-ticking chunk to a
ticking one as their `lastTick` value remains stuck on the last tick in
a ticking chunk and hence lead to a large "catch up" once ticked again.

Paper completely removes the "tick skipping" behaviour (See patch
"Further-improve-server-tick-loop"), making the above precautions
completely unnecessary, which also rids paper of the previous described
incompatibility with non-ticking chunks.
This commit is contained in:
Bjarne Koll 2024-09-16 23:07:29 +02:00
parent 883f50eb19
commit c8efaa46cb
3 changed files with 55 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
paper-server/patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch
View file

@ -59,7 +59,7 @@
@Nullable @Nullable
public UUID target; public UUID target;
public final float bobOffs; public final float bobOffs;
+ private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit + // private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit // Paper - remove anti tick skipping measures / wall time
+ public boolean canMobPickup = true; // Paper - Item#canEntityPickup + public boolean canMobPickup = true; // Paper - Item#canEntityPickup
+ private int despawnRate = -1; // Paper - Alternative item-despawn-rate + private int despawnRate = -1; // Paper - Alternative item-despawn-rate
+ public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API + public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
@ -80,7 +80,7 @@
} }
public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) { public ItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
@@ -133,12 +150,15 @@ @@ -133,12 +150,14 @@
@Override @Override
public void tick() { public void tick() {
if (this.getItem().isEmpty()) { if (this.getItem().isEmpty()) {
@ -88,19 +88,15 @@
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause + this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
} else { } else {
super.tick(); super.tick();
- if (this.pickupDelay > 0 && this.pickupDelay != 32767) { + // Paper start - remove anti tick skipping measures / wall time - revert to vanilla
- --this.pickupDelay; if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
- } --this.pickupDelay;
+ // CraftBukkit start - Use wall time for pickup and despawn timers }
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick; + // Paper end - remove anti tick skipping measures / wall time - revert to vanilla
+ if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
+ if (this.age != -32768) this.age += elapsedTicks;
+ this.lastTick = MinecraftServer.currentTick;
+ // CraftBukkit end
this.xo = this.getX(); this.xo = this.getX();
this.yo = this.getY(); this.yo = this.getY();
@@ -162,12 +182,16 @@ @@ -162,12 +181,16 @@
} }
} }
@ -119,11 +115,11 @@
f = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F; f = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F;
} }
@@ -188,9 +212,11 @@ @@ -188,9 +211,11 @@
this.mergeWithNeighbours(); this.mergeWithNeighbours();
} }
+ /* CraftBukkit start - moved up + // Paper - remove anti tick skipping measures / wall time - revert to vanilla /* CraftBukkit start - moved up
if (this.age != -32768) { if (this.age != -32768) {
++this.age; ++this.age;
} }
@ -131,7 +127,7 @@
this.hasImpulse |= this.updateInWaterStateAndDoFluidPushing(); this.hasImpulse |= this.updateInWaterStateAndDoFluidPushing();
if (!this.level().isClientSide) { if (!this.level().isClientSide) {
@@ -201,14 +227,42 @@ @@ -201,14 +226,44 @@
} }
} }
@ -153,12 +149,14 @@
+ // Spigot start - copied from above + // Spigot start - copied from above
@Override @Override
+ public void inactiveTick() { + public void inactiveTick() {
+ // CraftBukkit start - Use wall time for pickup and despawn timers + // Paper start - remove anti tick skipping measures / wall time - copied from above
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick; + if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
+ if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; + --this.pickupDelay;
+ if (this.age != -32768) this.age += elapsedTicks; + }
+ this.lastTick = MinecraftServer.currentTick; + if (this.age != -32768) {
+ // CraftBukkit end + ++this.age;
+ }
+ // Paper end - remove anti tick skipping measures / wall time - copied from above
+ +
+ if (!this.level().isClientSide && this.age >= this.despawnRate) { // Spigot // Paper - Alternative item-despawn-rate + if (!this.level().isClientSide && this.age >= this.despawnRate) { // Spigot // Paper - Alternative item-despawn-rate
+ // CraftBukkit start - fire ItemDespawnEvent + // CraftBukkit start - fire ItemDespawnEvent
@ -176,7 +174,7 @@
public BlockPos getBlockPosBelowThatAffectsMyMovement() { public BlockPos getBlockPosBelowThatAffectsMyMovement() {
return this.getOnPos(0.999999F); return this.getOnPos(0.999999F);
} }
@@ -229,7 +283,10 @@ @@ -229,7 +284,10 @@
private void mergeWithNeighbours() { private void mergeWithNeighbours() {
if (this.isMergable()) { if (this.isMergable()) {
@ -188,7 +186,7 @@
return entityitem != this && entityitem.isMergable(); return entityitem != this && entityitem.isMergable();
}); });
Iterator iterator = list.iterator(); Iterator iterator = list.iterator();
@@ -238,6 +295,14 @@ @@ -238,6 +296,14 @@
ItemEntity entityitem = (ItemEntity) iterator.next(); ItemEntity entityitem = (ItemEntity) iterator.next();
if (entityitem.isMergable()) { if (entityitem.isMergable()) {
@ -203,7 +201,7 @@
this.tryToMerge(entityitem); this.tryToMerge(entityitem);
if (this.isRemoved()) { if (this.isRemoved()) {
break; break;
@@ -251,7 +316,7 @@ @@ -251,7 +317,7 @@
private boolean isMergable() { private boolean isMergable() {
ItemStack itemstack = this.getItem(); ItemStack itemstack = this.getItem();
@ -212,7 +210,7 @@
} }
private void tryToMerge(ItemEntity other) { private void tryToMerge(ItemEntity other) {
@@ -259,7 +324,7 @@ @@ -259,7 +325,7 @@
ItemStack itemstack1 = other.getItem(); ItemStack itemstack1 = other.getItem();
if (Objects.equals(this.target, other.target) && ItemEntity.areMergable(itemstack, itemstack1)) { if (Objects.equals(this.target, other.target) && ItemEntity.areMergable(itemstack, itemstack1)) {
@ -221,7 +219,7 @@
ItemEntity.merge(this, itemstack, other, itemstack1); ItemEntity.merge(this, itemstack, other, itemstack1);
} else { } else {
ItemEntity.merge(other, itemstack1, this, itemstack); ItemEntity.merge(other, itemstack1, this, itemstack);
@@ -287,11 +352,16 @@ @@ -287,11 +353,16 @@
} }
private static void merge(ItemEntity targetEntity, ItemStack targetStack, ItemEntity sourceEntity, ItemStack sourceStack) { private static void merge(ItemEntity targetEntity, ItemStack targetStack, ItemEntity sourceEntity, ItemStack sourceStack) {
@ -239,7 +237,7 @@
} }
} }
@@ -320,12 +390,17 @@ @@ -320,12 +391,17 @@
} else if (!this.getItem().canBeHurtBy(source)) { } else if (!this.getItem().canBeHurtBy(source)) {
return false; return false;
} else { } else {
@ -258,7 +256,7 @@
} }
return true; return true;
@@ -339,6 +414,11 @@ @@ -339,6 +415,11 @@
@Override @Override
public void addAdditionalSaveData(CompoundTag nbt) { public void addAdditionalSaveData(CompoundTag nbt) {
@ -270,7 +268,7 @@
nbt.putShort("Health", (short) this.health); nbt.putShort("Health", (short) this.health);
nbt.putShort("Age", (short) this.age); nbt.putShort("Age", (short) this.age);
nbt.putShort("PickupDelay", (short) this.pickupDelay); nbt.putShort("PickupDelay", (short) this.pickupDelay);
@@ -381,23 +461,98 @@ @@ -381,23 +462,98 @@
this.setItem(ItemStack.EMPTY); this.setItem(ItemStack.EMPTY);
} }
@ -315,12 +313,12 @@
+ if (flyAtPlayer) { + if (flyAtPlayer) {
+ player.take(this, i); + player.take(this, i);
+ } + }
+
+ return; + return;
+ } + }
+ } + }
+ // Paper end - PlayerAttemptPickupItemEvent + // Paper end - PlayerAttemptPickupItemEvent
+
+ if (this.pickupDelay <= 0 && canHold > 0) { + if (this.pickupDelay <= 0 && canHold > 0) {
+ itemstack.setCount(canHold); + itemstack.setCount(canHold);
+ // Call legacy event + // Call legacy event
@ -372,7 +370,7 @@
itemstack.setCount(i); itemstack.setCount(i);
} }
@@ -438,6 +593,7 @@ @@ -438,6 +594,7 @@
public void setItem(ItemStack stack) { public void setItem(ItemStack stack) {
this.getEntityData().set(ItemEntity.DATA_ITEM, stack); this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
@ -380,7 +378,7 @@
} }
@Override @Override
@@ -492,7 +648,7 @@ @@ -492,7 +649,7 @@
public void makeFakeItem() { public void makeFakeItem() {
this.setNeverPickUp(); this.setNeverPickUp();

35
paper-server/patches/sources/net/minecraft/world/entity/monster/Zombie.java.patch
View file

@ -57,7 +57,7 @@
private boolean canBreakDoors; private boolean canBreakDoors;
private int inWaterTime; private int inWaterTime;
public int conversionTime; public int conversionTime;
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field + // private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field // Paper - remove anti tick skipping measures / wall time
+ private boolean shouldBurnInDay = true; // Paper - Add more Zombie API + private boolean shouldBurnInDay = true; // Paper - Add more Zombie API
public Zombie(EntityType<? extends Zombie> type, Level world) { public Zombie(EntityType<? extends Zombie> type, Level world) {
@ -115,27 +115,24 @@
} }
} }
@@ -203,7 +217,10 @@ @@ -203,7 +217,7 @@
public void tick() { public void tick() {
if (!this.level().isClientSide && this.isAlive() && !this.isNoAi()) { if (!this.level().isClientSide && this.isAlive() && !this.isNoAi()) {
if (this.isUnderWaterConverting()) { if (this.isUnderWaterConverting()) {
- --this.conversionTime; - --this.conversionTime;
+ // CraftBukkit start - Use wall time instead of ticks for conversion + --this.conversionTime; // Paper - remove anti tick skipping measures / wall time
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+ this.conversionTime -= elapsedTicks;
+ // CraftBukkit end
if (this.conversionTime < 0) { if (this.conversionTime < 0) {
this.doUnderWaterConversion(); this.doUnderWaterConversion();
} }
@@ -220,6 +237,7 @@ @@ -220,6 +234,7 @@
} }
super.tick(); super.tick();
+ this.lastTick = MinecraftServer.currentTick; // CraftBukkit + // this.lastTick = MinecraftServer.currentTick; // CraftBukkit // Paper - remove anti tick skipping measures / wall time
} }
@Override @Override
@@ -253,7 +271,14 @@ @@ -253,7 +268,14 @@
super.aiStep(); super.aiStep();
} }
@ -146,11 +143,11 @@
+ } + }
+ // Paper end - Add more Zombie API + // Paper end - Add more Zombie API
public void startUnderWaterConversion(int ticksUntilWaterConversion) { public void startUnderWaterConversion(int ticksUntilWaterConversion) {
+ this.lastTick = MinecraftServer.currentTick; // CraftBukkit + // this.lastTick = MinecraftServer.currentTick; // CraftBukkit // Paper - remove anti tick skipping measures / wall time
this.conversionTime = ticksUntilWaterConversion; this.conversionTime = ticksUntilWaterConversion;
this.getEntityData().set(Zombie.DATA_DROWNED_CONVERSION_ID, true); this.getEntityData().set(Zombie.DATA_DROWNED_CONVERSION_ID, true);
} }
@@ -267,32 +292,51 @@ @@ -267,32 +289,51 @@
} }
protected void convertToZombieType(EntityType<? extends Zombie> entityType) { protected void convertToZombieType(EntityType<? extends Zombie> entityType) {
@ -215,7 +212,7 @@
@Override @Override
public boolean hurtServer(ServerLevel world, DamageSource source, float amount) { public boolean hurtServer(ServerLevel world, DamageSource source, float amount) {
if (!super.hurtServer(world, source, amount)) { if (!super.hurtServer(world, source, amount)) {
@@ -323,10 +367,10 @@ @@ -323,10 +364,10 @@
if (SpawnPlacements.isSpawnPositionOk(entitytypes, world, blockposition) && SpawnPlacements.checkSpawnRules(entitytypes, world, EntitySpawnReason.REINFORCEMENT, blockposition, world.random)) { if (SpawnPlacements.isSpawnPositionOk(entitytypes, world, blockposition) && SpawnPlacements.checkSpawnRules(entitytypes, world, EntitySpawnReason.REINFORCEMENT, blockposition, world.random)) {
entityzombie.setPos((double) i1, (double) j1, (double) k1); entityzombie.setPos((double) i1, (double) j1, (double) k1);
@ -229,7 +226,7 @@
AttributeInstance attributemodifiable = this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE); AttributeInstance attributemodifiable = this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE);
AttributeModifier attributemodifier = attributemodifiable.getModifier(Zombie.REINFORCEMENT_CALLER_CHARGE_ID); AttributeModifier attributemodifier = attributemodifiable.getModifier(Zombie.REINFORCEMENT_CALLER_CHARGE_ID);
double d0 = attributemodifier != null ? attributemodifier.amount() : 0.0D; double d0 = attributemodifier != null ? attributemodifier.amount() : 0.0D;
@@ -352,7 +396,14 @@ @@ -352,7 +393,14 @@
float f = this.level().getCurrentDifficultyAt(this.blockPosition()).getEffectiveDifficulty(); float f = this.level().getCurrentDifficultyAt(this.blockPosition()).getEffectiveDifficulty();
if (this.getMainHandItem().isEmpty() && this.isOnFire() && this.random.nextFloat() < f * 0.3F) { if (this.getMainHandItem().isEmpty() && this.isOnFire() && this.random.nextFloat() < f * 0.3F) {
@ -245,7 +242,7 @@
} }
} }
@@ -385,7 +436,7 @@ @@ -385,7 +433,7 @@
@Override @Override
public EntityType<? extends Zombie> getType() { public EntityType<? extends Zombie> getType() {
@ -254,7 +251,7 @@
} }
protected boolean canSpawnInLiquids() { protected boolean canSpawnInLiquids() {
@@ -414,6 +465,7 @@ @@ -414,6 +462,7 @@
nbt.putBoolean("CanBreakDoors", this.canBreakDoors()); nbt.putBoolean("CanBreakDoors", this.canBreakDoors());
nbt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1); nbt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
nbt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1); nbt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
@ -262,7 +259,7 @@
} }
@Override @Override
@@ -425,6 +477,11 @@ @@ -425,6 +474,11 @@
if (nbt.contains("DrownedConversionTime", 99) && nbt.getInt("DrownedConversionTime") > -1) { if (nbt.contains("DrownedConversionTime", 99) && nbt.getInt("DrownedConversionTime") > -1) {
this.startUnderWaterConversion(nbt.getInt("DrownedConversionTime")); this.startUnderWaterConversion(nbt.getInt("DrownedConversionTime"));
} }
@ -274,7 +271,7 @@
} }
@@ -432,10 +489,8 @@ @@ -432,10 +486,8 @@
public boolean killedEntity(ServerLevel world, LivingEntity other) { public boolean killedEntity(ServerLevel world, LivingEntity other) {
boolean flag = super.killedEntity(world, other); boolean flag = super.killedEntity(world, other);
@ -287,7 +284,7 @@
if (this.convertVillagerToZombieVillager(world, entityvillager)) { if (this.convertVillagerToZombieVillager(world, entityvillager)) {
flag = false; flag = false;
@@ -468,7 +523,7 @@ @@ -468,7 +520,7 @@
float f = difficulty.getSpecialMultiplier(); float f = difficulty.getSpecialMultiplier();
if (spawnReason != EntitySpawnReason.CONVERSION) { if (spawnReason != EntitySpawnReason.CONVERSION) {
@ -296,7 +293,7 @@
} }
if (object == null) { if (object == null) {
@@ -496,7 +551,7 @@ @@ -496,7 +548,7 @@
entitychicken1.finalizeSpawn(world, difficulty, EntitySpawnReason.JOCKEY, (SpawnGroupData) null); entitychicken1.finalizeSpawn(world, difficulty, EntitySpawnReason.JOCKEY, (SpawnGroupData) null);
entitychicken1.setChickenJockey(true); entitychicken1.setChickenJockey(true);
this.startRiding(entitychicken1); this.startRiding(entitychicken1);

18
paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch
View file

@ -34,7 +34,7 @@
public int fuel; public int fuel;
protected final ContainerData dataAccess; protected final ContainerData dataAccess;
+ // CraftBukkit start - add fields and methods + // CraftBukkit start - add fields and methods
+ private int lastTick = MinecraftServer.currentTick; + // private int lastTick = MinecraftServer.currentTick; // Paper - remove anti tick skipping measures / wall time
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK; + private int maxStack = MAX_STACK;
@ -89,18 +89,16 @@
setChanged(world, pos, state); setChanged(world, pos, state);
} }
@@ -116,12 +170,17 @@ @@ -116,12 +170,15 @@
boolean flag1 = blockEntity.brewTime > 0; boolean flag1 = blockEntity.brewTime > 0;
ItemStack itemstack1 = (ItemStack) blockEntity.items.get(3); ItemStack itemstack1 = (ItemStack) blockEntity.items.get(3);
+ // CraftBukkit start - Use wall time instead of ticks for brewing + // Paper - remove anti tick skipping measures / wall time
+ int elapsedTicks = MinecraftServer.currentTick - blockEntity.lastTick;
+ blockEntity.lastTick = MinecraftServer.currentTick;
+ +
if (flag1) { if (flag1) {
- --blockEntity.brewTime; - --blockEntity.brewTime;
- boolean flag2 = blockEntity.brewTime == 0; - boolean flag2 = blockEntity.brewTime == 0;
+ blockEntity.brewTime -= elapsedTicks; + --blockEntity.brewTime; // Paper - remove anti tick skipping measures / wall time - revert to vanilla
+ boolean flag2 = blockEntity.brewTime <= 0; // == -> <= + boolean flag2 = blockEntity.brewTime <= 0; // == -> <=
+ // CraftBukkit end + // CraftBukkit end
@ -110,7 +108,7 @@
} else if (!flag || !itemstack1.is(blockEntity.ingredient)) { } else if (!flag || !itemstack1.is(blockEntity.ingredient)) {
blockEntity.brewTime = 0; blockEntity.brewTime = 0;
} }
@@ -129,7 +188,11 @@ @@ -129,7 +186,11 @@
setChanged(world, pos, state); setChanged(world, pos, state);
} else if (flag && blockEntity.fuel > 0) { } else if (flag && blockEntity.fuel > 0) {
--blockEntity.fuel; --blockEntity.fuel;
@ -123,7 +121,7 @@
blockEntity.ingredient = itemstack1.getItem(); blockEntity.ingredient = itemstack1.getItem();
setChanged(world, pos, state); setChanged(world, pos, state);
} }
@@ -185,14 +248,36 @@ @@ -185,14 +246,36 @@
} }
} }
@ -163,7 +161,7 @@
itemstack.shrink(1); itemstack.shrink(1);
ItemStack itemstack1 = itemstack.getItem().getCraftingRemainder(); ItemStack itemstack1 = itemstack.getItem().getCraftingRemainder();
@@ -200,12 +285,12 @@ @@ -200,12 +283,12 @@
if (itemstack.isEmpty()) { if (itemstack.isEmpty()) {
itemstack = itemstack1; itemstack = itemstack1;
} else { } else {
@ -179,7 +177,7 @@
} }
@Override @Override
@@ -231,12 +316,12 @@ @@ -231,12 +314,12 @@
@Override @Override
public boolean canPlaceItem(int slot, ItemStack stack) { public boolean canPlaceItem(int slot, ItemStack stack) {