Merge branch 'dev' into player-anims

# Conflicts:
#	src/main/java/noppes/npcs/roles/JobPuppet.java
This commit is contained in:
Luis C.M committed 2023-01-07 14:02:47 -06:00
commit cfd724edf6
2 files changed
+28 -70

No files matched your search

@@ -119,6 +119,9 @@ public class JobPuppet extends JobInterface{
public float originalPivotY = 0f;
public float originalPivotZ = 0f;
public float[] prevRotations = new float[]{0,0,0};
public float[] prevPivots = new float[]{0,0,0};
public boolean disabled = false;
public NBTTagCompound writeNBT(){