Updated Upstream (Pufferfish)

Upstream has released updates that appear to apply and compile correctly Pufferfish Changes: pufferfish-gg/Pufferfish@f05b0e9 Updated Upstream (Paper) pufferfish-gg/Pufferfish@9a82b86 Updated Upstream (Paper) pufferfish-gg/Pufferfish@c6ec7a0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@c789f72 Updated Upstream (Paper) pufferfish-gg/Pufferfish@9ddaa1a Updated Upstream (Paper) pufferfish-gg/Pufferfish@3554f78 Updated Upstream (Paper) pufferfish-gg/Pufferfish@a9e9d99 Updated Upstream (Paper) pufferfish-gg/Pufferfish@09a2f81 Updated Upstream (Paper) pufferfish-gg/Pufferfish@63ce67d Updated Upstream (Paper) pufferfish-gg/Pufferfish@8abd47b Updated Upstream (Paper) pufferfish-gg/Pufferfish@3415da0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@cfa3c61 Updated Upstream (Paper) pufferfish-gg/Pufferfish@0a8641d 1.21.3 Update pufferfish-gg/Pufferfish@784d72f Updated Upstream (Paper) pufferfish-gg/Pufferfish@40e1ad0 Updated Upstream (Paper) pufferfish-gg/Pufferfish@95ef348 Make iterator counting in IteratorSafeOrderedReferenceSet thread-safe for async mob spawning (#109) pufferfish-gg/Pufferfish@34c0042 Updated Upstream (Paper)
2026-02-21 18:37:42 +01:00 · 2024-11-30 20:49:52 -08:00
parent e141f680fd
commit 7f6f667142
294 changed files with 902 additions and 1476 deletions
--- a/patches/server/0093-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0093-Furnace-uses-lava-from-underneath.patch
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 19 Oct 2020 15:14:01 -0500
-Subject: [PATCH] Furnace uses lava from underneath
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 15e0861486a2bda3e2f4049b1b5a299c870acd31..91a158ed90b7ce3eac7277fd962682a0226c08ed 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -219,6 +219,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-         }
- 
-         ItemStack itemstack = (ItemStack) blockEntity.items.get(1);
-+        // Purpur start
-+        boolean usedLavaFromUnderneath = false;
-+        if (world.purpurConfig.furnaceUseLavaFromUnderneath && !blockEntity.isLit() && itemstack.isEmpty() && !blockEntity.items.get(0).isEmpty() && world.getGameTime() % 20 == 0) {
-+            BlockPos below = blockEntity.getBlockPos().below();
-+            BlockState belowState = world.getBlockStateIfLoaded(below);
-+            if (belowState != null && belowState.is(Blocks.LAVA)) {
-+                net.minecraft.world.level.material.FluidState fluidState = belowState.getFluidState();
-+                if (fluidState != null && fluidState.isSource()) {
-+                    world.setBlock(below, Blocks.AIR.defaultBlockState(), 3);
-+                    itemstack = Items.LAVA_BUCKET.getDefaultInstance();
-+                    usedLavaFromUnderneath = true;
-+                }
-+            }
-+        }
-+        // Purpur end
-         ItemStack itemstack1 = (ItemStack) blockEntity.items.get(0);
-         boolean flag2 = !itemstack1.isEmpty();
-         boolean flag3 = !itemstack.isEmpty();
-@@ -308,6 +323,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
-             setChanged(world, pos, state);
-         }
- 
-+        if (usedLavaFromUnderneath) blockEntity.items.set(1, ItemStack.EMPTY); // Purpur
-     }
- 
-     private static boolean canBurn(RegistryAccess dynamicRegistryManager, @Nullable RecipeHolder<? extends AbstractCookingRecipe> recipe, SingleRecipeInput input, NonNullList<ItemStack> inventory, int maxCount) {
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c895c2e2bbdcc0cbdd69b2086e2d2d76a105f225..d1a7e79ca23ad7a9b589578c91b2dd3427545a05 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -365,6 +365,17 @@ public class PurpurWorldConfig {
-         farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
-     }
- 
-+    public boolean furnaceUseLavaFromUnderneath = false;
-+    private void furnaceSettings() {
-+        if (PurpurConfig.version < 17) {
-+            furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.infinite-fuel", furnaceUseLavaFromUnderneath);
-+            boolean oldValue = getBoolean("blocks.furnace.infinite-fuel", furnaceUseLavaFromUnderneath);
-+            set("blocks.furnace.infinite-fuel", null);
-+            set("blocks.furnace.use-lava-from-underneath", oldValue);
-+        }
-+        furnaceUseLavaFromUnderneath = getBoolean("blocks.furnace.use-lava-from-underneath", furnaceUseLavaFromUnderneath);
-+    }
-+
-     public int lavaInfiniteRequiredSources = 2;
-     public int lavaSpeedNether = 10;
-     public int lavaSpeedNotNether = 30;