From 8570664edca42193b239cda5f0bff6af33223a6b Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Fri, 12 Jun 2015 23:28:10 +0200 Subject: [PATCH] Fixed possible NPEs if Keyframes in List being null --- .../replaymod/gui/elements/GuiKeyframeTimeline.java | 6 +----- .../crushedpixel/replaymod/holders/KeyframeComparator.java | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java index ce969939..0bdb1ddf 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java @@ -100,10 +100,6 @@ public class GuiKeyframeTimeline extends GuiTimeline { @Override public void mouseRelease(Minecraft mc, int mouseX, int mouseY, int button) { mouseDrag(mc, mouseX, mouseY, button); - if(clickedKeyFrame instanceof MarkerKeyframe && dragging == false) { - ReplayMod.replaySender.jumpToTime(clickedKeyFrame.getRealTimestamp()); - ReplayHandler.setLastPosition(((MarkerKeyframe)clickedKeyFrame).getPosition()); - } clickedKeyFrame = null; dragging = false; } @@ -165,7 +161,7 @@ public class GuiKeyframeTimeline extends GuiTimeline { while(iterator.hasNext()) { Keyframe kf = iterator.next(); - if(!kf.equals(ReplayHandler.getSelectedKeyframe())) + if(kf != null && !kf.equals(ReplayHandler.getSelectedKeyframe())) drawKeyframe(kf, bodyWidth, leftTime, rightTime, segmentLength); } diff --git a/src/main/java/eu/crushedpixel/replaymod/holders/KeyframeComparator.java b/src/main/java/eu/crushedpixel/replaymod/holders/KeyframeComparator.java index 75c737cc..e6d31e46 100755 --- a/src/main/java/eu/crushedpixel/replaymod/holders/KeyframeComparator.java +++ b/src/main/java/eu/crushedpixel/replaymod/holders/KeyframeComparator.java @@ -6,6 +6,7 @@ public class KeyframeComparator implements Comparator { @Override public int compare(Keyframe o1, Keyframe o2) { + if(o1 == null || o2 == null) return 0; return ((Integer) o1.getRealTimestamp()).compareTo(o2.getRealTimestamp()); }