From 2621c26d6df95c156071aad342d6cfe325fdac27 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Mon, 6 May 2024 18:20:23 +0300 Subject: [PATCH] Fixed manual animations not playing without idle animation selected --- .../java/com/goodbird/npcgecko/entity/EntityCustomModel.java | 4 ++-- .../com/goodbird/npcgecko/tile/TileEntityCustomModel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java b/src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java index 5cb1a01..e973abc 100644 --- a/src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java +++ b/src/main/java/com/goodbird/npcgecko/entity/EntityCustomModel.java @@ -39,7 +39,7 @@ public class EntityCustomModel extends EntityCreature implements IAnimatable, IA private PlayState predicateMovement(AnimationEvent event) { if (manualAnim != null) { - if (event.getController().getAnimationState() == AnimationState.Stopped) { + if (event.getController().currentAnimationBuilder == manualAnim && event.getController().getAnimationState() == AnimationState.Stopped) { manualAnim = null; } else { if (event.getController().currentAnimationBuilder != manualAnim) { @@ -50,7 +50,7 @@ public class EntityCustomModel extends EntityCreature implements IAnimatable, IA } } if (dialogAnim != null) { - if (event.getController().getAnimationState() == AnimationState.Stopped) { + if (event.getController().currentAnimationBuilder == dialogAnim && event.getController().getAnimationState() == AnimationState.Stopped) { dialogAnim = null; } else { if (event.getController().currentAnimationBuilder != dialogAnim) { diff --git a/src/main/java/com/goodbird/npcgecko/tile/TileEntityCustomModel.java b/src/main/java/com/goodbird/npcgecko/tile/TileEntityCustomModel.java index 600dee3..808a8c3 100644 --- a/src/main/java/com/goodbird/npcgecko/tile/TileEntityCustomModel.java +++ b/src/main/java/com/goodbird/npcgecko/tile/TileEntityCustomModel.java @@ -33,7 +33,7 @@ public class TileEntityCustomModel extends TileEntity implements IAnimatable { private PlayState predicate(AnimationEvent event) { if (manualAnim != null) { - if (event.getController().getAnimationState() == AnimationState.Stopped) { + if (event.getController().currentAnimationBuilder == manualAnim && event.getController().getAnimationState() == AnimationState.Stopped) { manualAnim = null; } else { if (event.getController().currentAnimationBuilder != manualAnim) {