include pufferfish patches

2026-02-17 16:37:43 +01:00 · 2023-03-22 05:27:54 -07:00
parent 9cda2e740b
commit a0077699e6
362 changed files with 4983 additions and 751 deletions
--- a/patches/server/0128-Movement-options-for-armor-stands.patch
+++ b/patches/server/0128-Movement-options-for-armor-stands.patch
@@ -1,88 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Sat, 9 Jan 2021 22:22:59 +0100
-Subject: [PATCH] Movement options for armor stands
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ebd4007797bda63e276056bee1eb85b08bc40309..a466eb10690bc0fe204815d758cc69798ce94f13 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1711,7 +1711,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-         return this.isInWater() || flag;
-     }
- 
-    void updateInWaterStateAndDoWaterCurrentPushing() {
-+    public void updateInWaterStateAndDoWaterCurrentPushing() { // Purpur - package-private -> public
-         Entity entity = this.getVehicle();
- 
-         if (entity instanceof Boat) {
-diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index 5b4523320de59167bd5864b2f17187590afb5ad6..88949e8ca7e4a5e74a8a365bb1aa6d466d3f8ddd 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -99,10 +99,12 @@ public class ArmorStand extends LivingEntity {
-     private boolean noTickPoseDirty = false;
-     private boolean noTickEquipmentDirty = false;
-     // Paper end
-+    public boolean canMovementTick = true; // Purpur
- 
-     public ArmorStand(EntityType<? extends ArmorStand> type, Level world) {
-         super(type, world);
-         if (world != null) this.canTick = world.paperConfig().entities.armorStands.tick; // Paper - armour stand ticking
-+        if (world != null) this.canMovementTick = world.purpurConfig.armorstandMovement; // Purpur
-         this.handItems = NonNullList.withSize(2, ItemStack.EMPTY);
-         this.armorItems = NonNullList.withSize(4, ItemStack.EMPTY);
-         this.headPose = ArmorStand.DEFAULT_HEAD_POSE;
-@@ -1007,4 +1009,18 @@ public class ArmorStand extends LivingEntity {
-     }
-     // Paper end
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public void updateInWaterStateAndDoWaterCurrentPushing() {
-+        if (this.level.purpurConfig.armorstandWaterMovement &&
-+                (this.level.purpurConfig.armorstandWaterFence || !(level.getBlockState(blockPosition().below()).getBlock() instanceof net.minecraft.world.level.block.FenceBlock)))
-+            super.updateInWaterStateAndDoWaterCurrentPushing();
-+    }
-+
-+    @Override
-+    public void aiStep() {
-+        if (this.canMovementTick && this.canMove) super.aiStep();
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 076aeb4d30dcf968a6c84af9da091e72ec547c78..7836da33836986cec3f0aac1dee2ec01a9c568d4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -101,10 +101,16 @@ public class PurpurWorldConfig {
-     public float armorstandStepHeight = 0.0F;
-     public boolean armorstandSetNameVisible = true;
-     public boolean armorstandFixNametags = false;
-+    public boolean armorstandMovement = true;
-+    public boolean armorstandWaterMovement = true;
-+    public boolean armorstandWaterFence = true;
-     private void armorstandSettings() {
-         armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
-         armorstandSetNameVisible = getBoolean("gameplay-mechanics.armorstand.set-name-visible-when-placing-with-custom-name", armorstandSetNameVisible);
-         armorstandFixNametags = getBoolean("gameplay-mechanics.armorstand.fix-nametags", armorstandFixNametags);
-+        armorstandMovement = getBoolean("gameplay-mechanics.armorstand.can-movement-tick", armorstandMovement);
-+        armorstandWaterMovement = getBoolean("gameplay-mechanics.armorstand.can-move-in-water", armorstandWaterMovement);
-+        armorstandWaterFence = getBoolean("gameplay-mechanics.armorstand.can-move-in-water-over-fence", armorstandWaterFence);
-     }
- 
-     public boolean arrowMovementResetsDespawnCounter = true;