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

Little more progress

Browse Source 
Keep getting interrupted so not as much as I'd like :(
This commit is contained in:
Zach Brown
2019-12-11 18:03:31 -06:00
parent c9ef3d1cfc
commit dd751b9191
40 changed files with 263 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,15 +8,15 @@ 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 b337fb812..d8497fa5e 100644
index 80bf58b05..eb6cf3a86 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
private final NonNullList<ItemStack> armorItems;
private boolean bD;
public long bt;
- private int bE;
+ private int bE; public void setDisabledSlots(int i) { bE = i;} public int getDisabledSlots() { return bE ;} // Paper - OBFHELPER
private boolean armorStandInvisible;
public long bq;
- private int bB;
+ private int bB; public void setDisabledSlots(int i) { bB = i; } public int getDisabledSlots() { return bB; } // Paper - OBFHELPER
public Vector3f headPose;
public Vector3f bodyPose;
public Vector3f leftArmPose;
@@ -25,8 +25,8 @@ index b337fb812..d8497fa5e 100644
}
+ public boolean isSlotDisabled(EnumItemSlot slot) { return this.d(slot); } // Paper - OBFHELPER
public boolean d(EnumItemSlot enumitemslot) {
return (this.bE & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms();
private boolean d(EnumItemSlot enumitemslot) {
return (this.bB & 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 124c3185b..d1d689e5d 100644