SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(1.16.3) Missed some fixes to include in commit

Browse Source
This commit is contained in:
Aikar
2020-09-10 19:56:58 -04:00
parent 9f446a771f
commit 465e97513b
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/Implement-Expanded-ArmorStand-API.patch
View File

@@ -23,20 +23,6 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
}
@Override
+ @Deprecated // Paper
public ItemStack getItemInHand() {
return getEquipment().getItemInHand();
}
@Override
+ @Deprecated // Paper
public void setItemInHand(ItemStack item) {
getEquipment().setItemInHand(item);
}
@@ -0,0 +0,0 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
public void setCanMove(boolean move) {
getHandle().canMove = move;
@@ -91,7 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ for (org.bukkit.inventory.EquipmentSlot slot : slots) {
+ if (slot == org.bukkit.inventory.EquipmentSlot.OFF_HAND) continue;
+ net.minecraft.server.EnumItemSlot nmsSlot = org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot);
+ disabled += (1 << nmsSlot.c()) + (1 << (nmsSlot.c() + 8)) + (1 << (nmsSlot.c() + 16));
+ disabled += (1 << nmsSlot.getSlotFlag()) + (1 << (nmsSlot.getSlotFlag() + 8)) + (1 << (nmsSlot.getSlotFlag() + 16));
+ }
+ getHandle().disabledSlots = disabled;
+ }