From 6945004afa2c4d0b447f5025ab3b76bb52f8e42c Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Tue, 15 Feb 2022 18:29:58 +0100
Subject: [PATCH] Update on hasInUpperState..bugs?
---
.../avatartranslator/AvatarStateMachineElement.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/avatartranslator/AvatarStateMachineElement.java b/src/main/java/avatartranslator/AvatarStateMachineElement.java
index ad7bff65b6..64384093f1 100644
--- a/src/main/java/avatartranslator/AvatarStateMachineElement.java
+++ b/src/main/java/avatartranslator/AvatarStateMachineElement.java
@@ -180,16 +180,23 @@ public abstract class AvatarStateMachineElement extends AvatarElement {
}
public boolean hasInUpperState(AvatarState _as) {
- if (getState() == _as) {
+ AvatarState as = getState();
+
+ if (_as == null) {
+ return false;
+ }
+
+ if (as == _as) {
return true;
}
- if (getState() != null) {
+ if (as != null) {
return getState().hasInUpperState(_as);
}
return false;
}
+
public boolean inAnUpperStateOf(AvatarState _state) {
if (_state == null) {
--
GitLab