DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed possible NPEs if Keyframes in List being null

Browse Source
This commit is contained in:
CrushedPixel
2015-06-12 23:28:10 +02:00
parent 8ef7e768d6
commit 8570664edc
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java
View File

@@ -100,10 +100,6 @@ public class GuiKeyframeTimeline extends GuiTimeline {
@Override @Override
public void mouseRelease(Minecraft mc, int mouseX, int mouseY, int button) { public void mouseRelease(Minecraft mc, int mouseX, int mouseY, int button) {
mouseDrag(mc, mouseX, mouseY, button); mouseDrag(mc, mouseX, mouseY, button);
if(clickedKeyFrame instanceof MarkerKeyframe && dragging == false) {
ReplayMod.replaySender.jumpToTime(clickedKeyFrame.getRealTimestamp());
ReplayHandler.setLastPosition(((MarkerKeyframe)clickedKeyFrame).getPosition());
}
clickedKeyFrame = null; clickedKeyFrame = null;
dragging = false; dragging = false;
} }
@@ -165,7 +161,7 @@ public class GuiKeyframeTimeline extends GuiTimeline {
while(iterator.hasNext()) { while(iterator.hasNext()) {
Keyframe kf = iterator.next(); Keyframe kf = iterator.next();
if(!kf.equals(ReplayHandler.getSelectedKeyframe())) if(kf != null && !kf.equals(ReplayHandler.getSelectedKeyframe()))
drawKeyframe(kf, bodyWidth, leftTime, rightTime, segmentLength); drawKeyframe(kf, bodyWidth, leftTime, rightTime, segmentLength);
} }

1
src/main/java/eu/crushedpixel/replaymod/holders/KeyframeComparator.java
View File

@@ -6,6 +6,7 @@ public class KeyframeComparator implements Comparator<Keyframe> {
@Override @Override
public int compare(Keyframe o1, Keyframe o2) { public int compare(Keyframe o1, Keyframe o2) {
if(o1 == null || o2 == null) return 0;
return ((Integer) o1.getRealTimestamp()).compareTo(o2.getRealTimestamp()); return ((Integer) o1.getRealTimestamp()).compareTo(o2.getRealTimestamp());
} }