mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 12:15:11 +00:00
Fix Built In Animation
This commit is contained in:
1 parent
e73054a529
commit
c339e5edbc
11 files changed
+205
-73
No files matched your search
@@ -314,13 +314,18 @@ public class AnimationController implements IAnimationHandler {
|
||||
}
|
||||
|
||||
public IAnimation get(String name) {
|
||||
// Check built-in animations first (by name)
|
||||
// Check user/custom animations first (allows overriding built-in)
|
||||
for (Map.Entry<Integer, Animation> entry : animations.entrySet()) {
|
||||
if (entry.getValue().name.equalsIgnoreCase(name)) {
|
||||
return entry.getValue();
|
||||
}
|
||||
}
|
||||
// Then check built-in animations
|
||||
BuiltInAnimation builtIn = builtInAnimations.get(name.toLowerCase());
|
||||
if (builtIn != null) {
|
||||
return builtIn;
|
||||
}
|
||||
// Then check user animations
|
||||
return getAnimationFromName(name);
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -384,17 +389,17 @@ public class AnimationController implements IAnimationHandler {
|
||||
}
|
||||
|
||||
public Animation getAnimationFromName(String animation) {
|
||||
// Check built-in animations first (by name)
|
||||
BuiltInAnimation builtIn = builtInAnimations.get(animation.toLowerCase());
|
||||
if (builtIn != null) {
|
||||
return builtIn;
|
||||
}
|
||||
// Then check user animations
|
||||
// Check user/custom animations first (allows overriding built-in)
|
||||
for (Map.Entry<Integer, Animation> entryAnimation : animations.entrySet()) {
|
||||
if (entryAnimation.getValue().name.equalsIgnoreCase(animation)) {
|
||||
return entryAnimation.getValue();
|
||||
}
|
||||
}
|
||||
// Then check built-in animations
|
||||
BuiltInAnimation builtIn = builtInAnimations.get(animation.toLowerCase());
|
||||
if (builtIn != null) {
|
||||
return builtIn;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user