geforkt von Mirrors/Paper
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.
42 Zeilen
1.9 KiB
Diff
42 Zeilen
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake <jake.m.potrebic@gmail.com>
|
|
Date: Sat, 15 Jun 2024 18:50:18 +0100
|
|
Subject: [PATCH] Fix removing recipes from RecipeIterator
|
|
|
|
== AT ==
|
|
public net.minecraft.world.item.crafting.RecipeManager byName
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
|
|
index 78a2afa981407de793ac940d6eb7315c5cd53b8f..33cd12d55786356dc89ab9d3872b2f7d266c3de2 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
|
|
@@ -9,6 +9,7 @@ import org.bukkit.inventory.Recipe;
|
|
|
|
public class RecipeIterator implements Iterator<Recipe> {
|
|
private final Iterator<Map.Entry<RecipeType<?>, RecipeHolder<?>>> recipes;
|
|
+ private Recipe currentRecipe; // Paper - fix removing recipes from RecipeIterator
|
|
|
|
public RecipeIterator() {
|
|
this.recipes = MinecraftServer.getServer().getRecipeManager().byType.entries().iterator();
|
|
@@ -21,11 +22,19 @@ public class RecipeIterator implements Iterator<Recipe> {
|
|
|
|
@Override
|
|
public Recipe next() {
|
|
- return this.recipes.next().getValue().toBukkitRecipe();
|
|
+ // Paper start - fix removing recipes from RecipeIterator
|
|
+ this.currentRecipe = this.recipes.next().getValue().toBukkitRecipe();
|
|
+ return this.currentRecipe;
|
|
+ // Paper end - fix removing recipes from RecipeIterator
|
|
}
|
|
|
|
@Override
|
|
public void remove() {
|
|
+ // Paper start - fix removing recipes from RecipeIterator
|
|
+ if (this.currentRecipe instanceof org.bukkit.Keyed keyed) {
|
|
+ MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey()));
|
|
+ }
|
|
+ // Paper end - fix removing recipes from RecipeIterator
|
|
this.recipes.remove();
|
|
}
|
|
}
|