upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 07:17:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java
#	src/main/java/noppes/npcs/mixin/MixinModelRenderer.java
This commit is contained in:
Luis C.M committed 2023-01-10 15:07:03 -06:00
2 parents cbc0b82356 1aee4c06fc
commit 3b69da5ef6
1 file changed
-5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/roles/JobPuppet.java
-5
View File
@@ -73,7 +73,6 @@ public class JobPuppet extends JobInterface{
public static class PartConfig implements IModelPart {
public Object parent;
public EntityLivingBase npcModel;
public float rotationX = 0f;
public float rotationY = 0f;
@@ -96,10 +95,6 @@ public class JobPuppet extends JobInterface{
public float destPivotX = 0f;
public float destPivotY = 0f;
public float destPivotZ = 0f;
public boolean setOriginalPivot = false;
public float originalPivotX = 0f;
public float originalPivotY = 0f;
public float originalPivotZ = 0f;
// ^^^ Client-sided use ^^^
public boolean disabled = false;