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)

patches/server/0211-options-to-extinguish-fire-blocks-with-snowballs.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <granny@purpurmc.org>
-Date: Thu, 14 Oct 2021 02:05:52 -0700
-Subject: [PATCH] options to extinguish fire blocks with snowballs
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-index 8c853b6fbbc966ee6ba9ad3770d4e2e2a50ef388..0db58e7d63a5c1b43a2224c247979f23a1d3f899 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Snowball.java
-@@ -63,6 +63,36 @@ public class Snowball extends ThrowableItemProjectile {
-         entity.hurt(this.damageSources().thrown(this, this.getOwner()), (float) i);
-     }
- 
-+    // Purpur start - borrowed and modified code from ThrownPotion#onHitBlock and ThrownPotion#dowseFire
-+    @Override
-+    protected void onHitBlock(net.minecraft.world.phys.BlockHitResult blockHitResult) {
-+        super.onHitBlock(blockHitResult);
-+
-+        if (!this.level().isClientSide) {
-+            net.minecraft.core.BlockPos blockposition = blockHitResult.getBlockPos();
-+            net.minecraft.core.BlockPos blockposition1 = blockposition.relative(blockHitResult.getDirection());
-+
-+            net.minecraft.world.level.block.state.BlockState iblockdata = this.level().getBlockState(blockposition);
-+
-+            if (this.level().purpurConfig.snowballExtinguishesFire && this.level().getBlockState(blockposition1).is(net.minecraft.world.level.block.Blocks.FIRE)) {
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, blockposition1, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState())) {
-+                    this.level().removeBlock(blockposition1, false);
-+                }
-+            } else if (this.level().purpurConfig.snowballExtinguishesCandles && net.minecraft.world.level.block.AbstractCandleBlock.isLit(iblockdata)) {
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.setValue(net.minecraft.world.level.block.AbstractCandleBlock.LIT, false))) {
-+                    net.minecraft.world.level.block.AbstractCandleBlock.extinguish(null, iblockdata, this.level(), blockposition);
-+                }
-+            } else if (this.level().purpurConfig.snowballExtinguishesCampfires && net.minecraft.world.level.block.CampfireBlock.isLitCampfire(iblockdata)) {
-+                if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this, blockposition, iblockdata.setValue(net.minecraft.world.level.block.CampfireBlock.LIT, false))) {
-+                    this.level().levelEvent(null, 1009, blockposition, 0);
-+                    net.minecraft.world.level.block.CampfireBlock.dowse(this.getOwner(), this.level(), blockposition, iblockdata);
-+                    this.level().setBlockAndUpdate(blockposition, iblockdata.setValue(net.minecraft.world.level.block.CampfireBlock.LIT, false));
-+                }
-+            }
-+        }
-+    }
-+    // Purpur end
-+
-     @Override
-     protected void onHit(HitResult hitResult) {
-         super.onHit(hitResult);
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6e40360445b198f153e3eca96ae2355a08b223d2..dcd17df4935b06108d41b6d652d030c31364e413 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -224,6 +224,9 @@ public class PurpurWorldConfig {
-     public int glowBerriesEatGlowDuration = 0;
-     public boolean shulkerBoxItemDropContentsWhenDestroyed = true;
-     public boolean compassItemShowsBossBar = false;
-+    public boolean snowballExtinguishesFire = false;
-+    public boolean snowballExtinguishesCandles = false;
-+    public boolean snowballExtinguishesCampfires = false;
-     private void itemSettings() {
-         itemImmuneToCactus.clear();
-         getList("gameplay-mechanics.item.immune.cactus", new ArrayList<>()).forEach(key -> {
-@@ -272,6 +275,9 @@ public class PurpurWorldConfig {
-         glowBerriesEatGlowDuration = getInt("gameplay-mechanics.item.glow_berries.eat-glow-duration", glowBerriesEatGlowDuration);
-         shulkerBoxItemDropContentsWhenDestroyed = getBoolean("gameplay-mechanics.item.shulker_box.drop-contents-when-destroyed", shulkerBoxItemDropContentsWhenDestroyed);
-         compassItemShowsBossBar = getBoolean("gameplay-mechanics.item.compass.holding-shows-bossbar", compassItemShowsBossBar);
-+        snowballExtinguishesFire = getBoolean("gameplay-mechanics.item.snowball.extinguish.fire", snowballExtinguishesFire);
-+        snowballExtinguishesCandles = getBoolean("gameplay-mechanics.item.snowball.extinguish.candles", snowballExtinguishesCandles);
-+        snowballExtinguishesCampfires = getBoolean("gameplay-mechanics.item.snowball.extinguish.campfires", snowballExtinguishesCampfires);
-     }
- 
-     public double minecartMaxSpeed = 0.4D;