mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 15:30:19 +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.
39 lines
2.1 KiB
Diff
39 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Mon, 19 Aug 2024 13:43:06 -0700
|
|
Subject: [PATCH] Fix SculkBloomEvent firing for block entity loading
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
|
|
index dbdd9cb76f9e2d0962001d9a1e82896c907d7aea..427e9bcb1fa9436543d7ff974eb8642ccce4a6a3 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/SculkSpreader.java
|
|
@@ -125,7 +125,7 @@ public class SculkSpreader {
|
|
int i = Math.min(list.size(), 32);
|
|
|
|
for (int j = 0; j < i; ++j) {
|
|
- this.addCursor((SculkSpreader.ChargeCursor) list.get(j));
|
|
+ this.addCursor((SculkSpreader.ChargeCursor) list.get(j), false); // Paper - don't fire event for block entity loading
|
|
}
|
|
}
|
|
|
|
@@ -145,16 +145,16 @@ public class SculkSpreader {
|
|
while (charge > 0) {
|
|
int j = Math.min(charge, 1000);
|
|
|
|
- this.addCursor(new SculkSpreader.ChargeCursor(pos, j));
|
|
+ this.addCursor(new SculkSpreader.ChargeCursor(pos, j), true); // Paper - allow firing event for other causes
|
|
charge -= j;
|
|
}
|
|
|
|
}
|
|
|
|
- private void addCursor(SculkSpreader.ChargeCursor cursor) {
|
|
+ private void addCursor(SculkSpreader.ChargeCursor cursor, boolean fireEvent) { // Paper - add boolean to conditionally fire SculkBloomEvent
|
|
if (this.cursors.size() < 32) {
|
|
// CraftBukkit start
|
|
- if (!this.isWorldGeneration()) { // CraftBukkit - SPIGOT-7475: Don't call event during world generation
|
|
+ if (!this.isWorldGeneration() && fireEvent) { // CraftBukkit - SPIGOT-7475: Don't call event during world generation // Paper - add boolean to conditionally fire SculkBloomEvent
|
|
CraftBlock bukkitBlock = CraftBlock.at(this.level, cursor.pos);
|
|
SculkBloomEvent event = new SculkBloomEvent(bukkitBlock, cursor.getCharge());
|
|
Bukkit.getPluginManager().callEvent(event);
|