OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-09 19:49:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-974: Add ArmorStand locking API

Browse source 
By: Martoph <sager1018@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2020-08-23 09:53:19 +10:00
parent 4625e066e8
commit 8a80efc01d
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
paper-server/nms-patches/EntityArmorStand.patch
View file

@ -16,6 +16,15 @@
public class EntityArmorStand extends EntityLiving { public class EntityArmorStand extends EntityLiving {
private static final Vector3f bj = new Vector3f(0.0F, 0.0F, 0.0F); private static final Vector3f bj = new Vector3f(0.0F, 0.0F, 0.0F);
@@ -29,7 +38,7 @@
private final NonNullList<ItemStack> armorItems;
private boolean armorStandInvisible;
public long bi;
- private int bv;
+ public int bv; //PAIL private -> public, rename disabledSlots
public Vector3f headPose;
public Vector3f bodyPose;
public Vector3f leftArmPose;
@@ -55,6 +64,13 @@ @@ -55,6 +64,13 @@
this.setPosition(d0, d1, d2); this.setPosition(d0, d1, d2);
} }

17
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
View file

@ -2,9 +2,11 @@ package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityArmorStand; import net.minecraft.server.EntityArmorStand;
import net.minecraft.server.Vector3f; import net.minecraft.server.Vector3f;
import org.bukkit.craftbukkit.CraftEquipmentSlot;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.ArmorStand; import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.util.EulerAngle; import org.bukkit.util.EulerAngle;
@ -211,4 +213,19 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
public void setMarker(boolean marker) { public void setMarker(boolean marker) {
getHandle().setMarker(marker); getHandle().setMarker(marker);
} }
@Override
public void addEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
getHandle().bv |= (1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8); // PAIL c() rename getSlotFlag()
}
@Override
public void removeEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
getHandle().bv &= ~(1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8);
}
@Override
public boolean hasEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
return (getHandle().bv & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8)) != 0;
}
} }