From 731ea1ab9f95249bf6217ee0260a849882bb967a Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 6 Jul 2019 12:56:39 +0200 Subject: [PATCH] Fix NPE when adding marker during recording before player is spawned Can happen e.g. when auto-recording is disabled --- .../replaymod/recording/packet/PacketListener.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/replaymod/recording/packet/PacketListener.java b/src/main/java/com/replaymod/recording/packet/PacketListener.java index 7a9a5a9c..64cd5792 100755 --- a/src/main/java/com/replaymod/recording/packet/PacketListener.java +++ b/src/main/java/com/replaymod/recording/packet/PacketListener.java @@ -387,11 +387,13 @@ public class PacketListener extends ChannelInboundHandlerAdapter { Marker marker = new Marker(); marker.setName(name); marker.setTime(timestamp); - marker.setX(view.x); - marker.setY(view.y); - marker.setZ(view.z); - marker.setYaw(view.yaw); - marker.setPitch(view.pitch); + if (view != null) { + marker.setX(view.x); + marker.setY(view.y); + marker.setZ(view.z); + marker.setYaw(view.yaw); + marker.setPitch(view.pitch); + } // Roll is always 0 saveService.submit(() -> { synchronized (replayFile) {