mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

start adding in ATs

Browse source
This commit is contained in:
MiniDigger 2021-06-15 21:44:22 +02:00
commit 90546c7c50
6 changed files with 18 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

13
patches/server/0236-Implement-Expanded-ArmorStand-API.patch
View file

@ -7,19 +7,6 @@ Add the following:
- Add proper methods for getting and setting items in both hands. Deprecates old methods
- Enable/Disable slot interactions
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 33f1e486f3732c156289b16d973297e771da82b9..4adde11daa5ca97a2bf9c164c43c5c011a89b33d 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
@@ -428,7 +428,7 @@ public class ArmorStand extends LivingEntity {
return enumitemslot;
}
- private boolean isDisabled(net.minecraft.world.entity.EquipmentSlot slot) {
+ public boolean isDisabled(net.minecraft.world.entity.EquipmentSlot slot) { // Paper - private -> public
return (this.disabledSlots & 1 << slot.getFilterFlag()) != 0 || slot.getType() == net.minecraft.world.entity.EquipmentSlot.Type.HAND && !this.isShowArms();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 82b9ee993b0d2e7e0685231f7bad2b85756ec959..f4065938bbfd04519d1363ee8781c316aca468ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java