diff --git a/src/main/java/net/minecraftforge/common/model/animation/Clips.java b/src/main/java/net/minecraftforge/common/model/animation/Clips.java index 7f588db040..8528b335c1 100644 --- a/src/main/java/net/minecraftforge/common/model/animation/Clips.java +++ b/src/main/java/net/minecraftforge/common/model/animation/Clips.java @@ -282,11 +282,17 @@ public final class Clips return Optional.absent(); } IJoint joint = (IJoint)part.get(); - if(!joint.getParent().isPresent()) + TRSRTransformation jointTransform = clip.apply(joint).apply(time).compose(joint.getInvBindPose()); + Optional parentTransform = Optional.absent(); + if(joint.getParent().isPresent()) { - return Optional.of(clip.apply(joint).apply(time).compose(joint.getInvBindPose())); + parentTransform = apply(Optional.of(joint.getParent().get())); } - return Optional.of(clip.apply(joint.getParent().get()).apply(time).compose(clip.apply(joint).apply(time)).compose(joint.getInvBindPose())); + if(parentTransform.isPresent()) + { + jointTransform = parentTransform.get().compose(jointTransform); + } + return Optional.of(jointTransform); } }, clip.pastEvents(lastPollTime, time)); }