1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0804-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0804-Correctly-handle-ArmorStand-invisibility.patch
new file mode 100644
index 0000000000..34b66d686a
--- /dev/null
+++ b/patches/server/0804-Correctly-handle-ArmorStand-invisibility.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 5 Mar 2023 14:38:21 -0800
+Subject: [PATCH] Correctly handle ArmorStand invisibility
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+index 1087840331f68ffe79e79f6493137b2b894832f9..9fe85d6f807e64cf02d8e1921672e3196f6d606f 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+@@ -152,6 +152,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
+         this.getHandle().noPhysics = !gravity;
+     }
+ 
++    // Paper start - Armor Stand has its own invisible field
++    @Override
++    public void setInvisible(final boolean invisible) {
++        this.getHandle().setInvisible(invisible);
++        super.setInvisible(invisible);
++    }
++    // Paper end
++
+     @Override
+     public boolean isVisible() {
+         return !this.getHandle().isInvisible();