From 92a6cefc208b23e53709b52713aa67b0b5770516 Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Wed, 31 Jul 2024 18:49:18 -0400
Subject: [PATCH] server plays blocking animation

---
 assets/Models/creatures/viewmodel.glb         | Bin 774628 -> 774688 bytes
 .../entity/btree/StateTransitionUtil.java     |  20 +++++++++++-------
 .../entity/state/block/ServerBlockTree.java   |   8 ++++++-
 .../server/poseactor/PoseActor.java           |   9 +++++---
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/assets/Models/creatures/viewmodel.glb b/assets/Models/creatures/viewmodel.glb
index 6ba1d2cf49d145d29fb99f5c044e2cc510846247..91f5103b4ca6f9a4933d36d22b16f27b84cdcaef 100644
GIT binary patch
delta 3152
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
ah3Owqij__5&G0lN^5GS%X`Es1tolC^Gh@8~

delta 3010
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
Jx=0t*{~wwA7ySSL

diff --git a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
index 03557d1e..32a6e2a4 100644
--- a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
+++ b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java
@@ -158,20 +158,24 @@ public class StateTransitionUtil {
             if(state.getAnimation != null && state.getAnimation.get() != null){
                 animation = state.getAnimation.get();
             }
-            
-            //Main simulation
-            if(!poseActor.isPlayingAnimation() && state.onComplete != null && state.startedAnimation == true && animation != null){
+
+
+            if(animation == null){
+                state.startedAnimation = true;
+                if(state.onComplete != null){
+                    state.onComplete.run();
+                }
+            } else if(!poseActor.isPlayingAnimation() && state.onComplete != null && state.startedAnimation == true){
                 //state transition if this isn't set to loop
                 state.onComplete.run();
                 state.startedAnimation = false;
-            } else if(state.animation != null && (!poseActor.isPlayingAnimation() || !poseActor.isPlayingAnimation(animation))){
+            } else if(!poseActor.isPlayingAnimation() || !poseActor.isPlayingAnimation(animation)){
                 //play animation for state
-                poseActor.playAnimation(animation);
+                if(animation != null){
+                    poseActor.playAnimation(animation);
+                }
                 poseActor.incrementAnimationTime(0.0001);
                 state.startedAnimation = true;
-            } else if(state.animation == null && state.onComplete != null){
-                state.onComplete.run();
-                state.startedAnimation = false;
             }
         }
     }
diff --git a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
index bb8d3396..b8792d79 100644
--- a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
+++ b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java
@@ -50,7 +50,13 @@ public class ServerBlockTree implements BehaviorTree {
         this.stateTransitionUtil = StateTransitionUtil.create(parent, true, new StateTransitionUtilItem[]{
             StateTransitionUtilItem.create(
                 BlockState.WIND_UP,
-                () -> {return this.blockSystem.getBlockVariant(this.currentBlockVariant).getWindUpAnimation();},
+                () -> {
+                    BlockVariant variant = this.blockSystem.getBlockVariant(this.currentBlockVariant);
+                    if(variant != null){
+                        return variant.getWindUpAnimation();
+                    }
+                    return null;
+                },
                 null,
                 () -> {this.setState(BlockState.BLOCKING);}
             ),
diff --git a/src/main/java/electrosphere/server/poseactor/PoseActor.java b/src/main/java/electrosphere/server/poseactor/PoseActor.java
index 5655665a..8fcd6181 100644
--- a/src/main/java/electrosphere/server/poseactor/PoseActor.java
+++ b/src/main/java/electrosphere/server/poseactor/PoseActor.java
@@ -101,12 +101,15 @@ public class PoseActor {
 
     /**
      * Gets whether the animation is currently playing or not
-     * @param animationName The animation
+     * @param animationData The animation
      * @return True if the animation is playing, false otherwise
      */
-    public boolean isPlayingAnimation(TreeDataAnimation animationName){
+    public boolean isPlayingAnimation(TreeDataAnimation animationData){
+        if(animationData == null){
+            return false;
+        }
         for(ActorAnimationMask mask : animationQueue){
-            if(mask.getAnimationName().contains(animationName.getNameThirdPerson())){
+            if(mask.getAnimationName().contains(animationData.getNameThirdPerson())){
                 return true;
             }
         }