upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-11 23:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed animation interpolation not working after animations are stopped.

Browse Source
This commit is contained in:
Luis C.M committed 2024-02-19 18:24:39 -06:00
1 parent f84b16b29a
commit fd7412148d
2 files changed
+13 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/PacketHandlerClient.java
+12 -14
View File
@@ -318,21 +318,19 @@ public class PacketHandlerClient extends PacketHandlerServer{
}
if (animationData != null) {
animationData.readFromNBT(compound);
int animationId;
if (compound.hasKey("AnimationID")) {
animationId = compound.getInteger("AnimationID");
} else {
Animation animation = new Animation();
animation.readFromNBT(compound.getCompoundTag("Animation"));
ClientCacheHandler.animationCache.put(animation.getID(), animation);
animationId = animation.getID();
}
int animationId;
if (compound.hasKey("AnimationID")) {
animationId = compound.getInteger("AnimationID");
} else {
Animation animation = new Animation();
animation.readFromNBT(compound.getCompoundTag("Animation"));
ClientCacheHandler.animationCache.put(animation.getID(), animation);
animationId = animation.getID();
}
if (animationData.allowAnimation) {
animationData.setAnimation(ClientCacheHandler.animationCache.get(animationId));
Client.sendData(EnumPacketServer.CacheAnimation, animationId);
}
animationData.setAnimation(ClientCacheHandler.animationCache.get(animationId));
animationData.readFromNBT(compound);
Client.sendData(EnumPacketServer.CacheAnimation, animationId);
}
}
else if(type == EnumPacketClient.DISABLE_MOUSE_INPUT) {
src/main/java/noppes/npcs/controllers/data/AnimationData.java
+1 -1
View File
@@ -153,7 +153,7 @@ public class AnimationData implements IAnimationData {
} else {
Animation newAnim = new Animation();
newAnim.readFromNBT(((Animation) animation).writeToNBT());
if (this.animation != null && newAnim.frames.size() > 0) {
if (this.isActive() && !newAnim.frames.isEmpty()) {
Frame frame = (Frame) this.animation.currentFrame();
if (frame != null) {
Frame firstFrame = newAnim.frames.get(0);