diff --git a/src/main/java/noppes/npcs/entity/EntityCustomNpc.java b/src/main/java/noppes/npcs/entity/EntityCustomNpc.java index b1a3c44f3..b47179edf 100644 --- a/src/main/java/noppes/npcs/entity/EntityCustomNpc.java +++ b/src/main/java/noppes/npcs/entity/EntityCustomNpc.java @@ -62,7 +62,7 @@ public class EntityCustomNpc extends EntityNPCFlying { @Override public void updateHitbox() { Entity entity = modelData.getEntity(this); - if (modelData == null || entity == null) { + if (entity == null) { baseHeight = 1.9f - modelData.getBodyY() + (modelData.modelScale.head.scaleY - 1) / 2; super.updateHitbox(); } else { diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 93fdd9723..220b218bb 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -328,7 +328,7 @@ public class RoleCompanion extends RoleInterface { ((CompanionTrader) jobInterface).interact(player); if (player != owner || !npc.isEntityAlive() || npc.isAttacking()) return; - if (player.isSneaking()) { + if (player != null && player.isSneaking()) { openGui(player); } else { setSitting(!isSitting());