Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 02:50:09 +01:00
c5a10665b8
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.
33 Zeilen
1.4 KiB
Diff
33 Zeilen
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Sun, 16 Jan 2022 10:34:02 -0800
|
|
Subject: [PATCH] Fix xp reward for baby zombies
|
|
|
|
The field that tracks the xpReward was not
|
|
getting reset if the death was cancelled
|
|
so this resets it after each call to
|
|
Zombie#getExperienceReward
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
|
index fd304e7d8305877d56de7a38b8664e5a70bf0c33..2280004638fd19ed018cb3e77d53a018b34ec516 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
|
|
@@ -176,11 +176,16 @@ public class Zombie extends Monster {
|
|
|
|
@Override
|
|
protected int getBaseExperienceReward() {
|
|
+ final int previousReward = this.xpReward; // Paper - store previous value to reset after calculating XP reward
|
|
if (this.isBaby()) {
|
|
this.xpReward = (int) ((double) this.xpReward * 2.5D);
|
|
}
|
|
|
|
- return super.getBaseExperienceReward();
|
|
+ // Paper start - store previous value to reset after calculating XP reward
|
|
+ int reward = super.getBaseExperienceReward();
|
|
+ this.xpReward = previousReward;
|
|
+ return reward;
|
|
+ // Paper end - store previous value to reset after calculating XP reward
|
|
}
|
|
|
|
@Override
|