diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
index c70e4f4..5eb8f2a 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
@@ -546,8 +546,10 @@ public class PacketProcessor {
         }
 
         if(source.isClosed()){
-            Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::endReplay);
-            task.cancel();
+            execSync(() -> {
+                Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::endReplay);
+                task.cancel();
+            });
         }
     }
 
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/record/REntity.java b/FightSystem_Core/src/de/steamwar/fightsystem/record/REntity.java
index 5b76758..52e1021 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/record/REntity.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/record/REntity.java
@@ -345,8 +345,8 @@ public class REntity {
         namedSpawnEntity.set(packet, entityId);
         namedSpawnUUID.set(packet, uuid);
         namedSpawnX.set(packet, locX);
-        namedSpawnX.set(packet, locY);
-        namedSpawnX.set(packet, locZ);
+        namedSpawnY.set(packet, locY);
+        namedSpawnZ.set(packet, locZ);
         FlatteningWrapper.impl.setNamedSpawnPacketDataWatcher(packet);
         return packet;
     }