diff options
| author | Shane Freeder <[email protected]> | 2019-12-10 23:37:32 +0000 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2019-12-10 23:37:32 +0000 |
| commit | 4d2f85630a3319e4b147ffbfd7db66e38e25f18d (patch) | |
| tree | e9aa6080f5c3585c259cd5681a57546738223215 | |
| parent | 53c1345e48bb14fdef699c1a82225791047000ea (diff) | |
| download | Paper-4d2f85630a3319e4b147ffbfd7db66e38e25f18d.tar.gz Paper-4d2f85630a3319e4b147ffbfd7db66e38e25f18d.zip | |
Fix ArmorStand#setItem flow (Fixes #2726)
| -rw-r--r-- | Spigot-Server-Patches/0271-Implement-Expanded-ArmorStand-API.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0271-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0271-Implement-Expanded-ArmorStand-API.patch index 3a9578bd27..5e02e86f72 100644 --- a/Spigot-Server-Patches/0271-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0271-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From a780bcc147ff715e5eb836894fa8915e357299c0 Mon Sep 17 00:00:00 2001 +From 570ab48d26bb36dee4b7cc7c474e9cb8d7982787 Mon Sep 17 00:00:00 2001 From: willies952002 <[email protected]> Date: Thu, 26 Jul 2018 02:25:46 -0400 Subject: [PATCH] Implement Expanded ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 297ed7c1ce..961e284712 100644 +index b337fb812..d8497fa5e 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving { @@ -29,7 +29,7 @@ index 297ed7c1ce..961e284712 100644 return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 124c3185bc..9f5c3b92e3 100644 +index 124c3185b..d1d689e5d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -72,7 +72,7 @@ index 124c3185bc..9f5c3b92e3 100644 + return; + case LEGS: + setLeggings(item); -+ break; ++ return; + case CHEST: + setChestplate(item); + return; @@ -126,5 +126,5 @@ index 124c3185bc..9f5c3b92e3 100644 // Paper end } -- -2.22.0 +2.24.0 |