Repo-Mirror/GeyserModelEngine
9
0
Fork 0
mirror of https://github.com/GeyserExtensionists/GeyserModelEngine.git synced 2025-12-20 15:39:18 +00:00
Code Issues Releases Activity

fix override anim

Browse Source
This commit is contained in:
zimzaza4
2024-09-28 12:12:06 +08:00
parent e554c7c572
commit 635be9d83f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/re/imc/geysermodelengine/model/EntityTask.java
View File

@@ -207,6 +207,7 @@ public class EntityTask {
Map<String, Boolean> boneUpdates = new HashMap<>(); Map<String, Boolean> boneUpdates = new HashMap<>();
Map<String, Boolean> animUpdates = new HashMap<>(); Map<String, Boolean> animUpdates = new HashMap<>();
Set<String> overrideAnimUpdates = new HashSet<>();
// if (GeyserModelEngine.getInstance().getEnablePartVisibilityModels().contains(model.getActiveModel().getBlueprint().getName())) { // if (GeyserModelEngine.getInstance().getEnablePartVisibilityModels().contains(model.getActiveModel().getBlueprint().getName())) {
model.getActiveModel().getBones().forEach((s, bone) -> { model.getActiveModel().getBones().forEach((s, bone) -> {
@@ -224,8 +225,18 @@ public class EntityTask {
// } // }
model.getActiveModel().getBlueprint().getAnimations().forEach((s, anim) -> { model.getActiveModel().getBlueprint().getAnimations().forEach((s, anim) -> {
animUpdates.put(s, model.getActiveModel().getAnimationHandler().isPlayingAnimation(s)); if (anim.isOverride() && model.getActiveModel().getAnimationHandler().isPlayingAnimation(s)) {
overrideAnimUpdates.add(s);
}
}); });
model.getActiveModel().getBlueprint().getAnimations().forEach((s, anim) -> {
if (overrideAnimUpdates.isEmpty()) {
animUpdates.put(s, model.getActiveModel().getAnimationHandler().isPlayingAnimation(s));
} else {
animUpdates.put(s, overrideAnimUpdates.contains(s));
}
});
/*f /*f
if (!lastAnimProperty.equals(currentAnimProperty)) { if (!lastAnimProperty.equals(currentAnimProperty)) {