diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
index 1f5a84b..9e25bce 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
@@ -60,6 +60,14 @@ public class EventRecordListener extends BasicListener {
         RecordSystem.playerJoins(e.getPlayer());
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerLeave(PlayerQuitEvent e) {
+        if(isNotSent(e.getPlayer()))
+            return;
+
+        RecordSystem.entityDespawns(e.getPlayer());
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent e){
         if(isNotSent(e.getPlayer()))
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java
index b68042e..f6cfefe 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/record/RecordSystem.java
@@ -168,7 +168,6 @@ public class RecordSystem {
             Recorder.rByte(pos.getY());
             Recorder.rByte(pos.getZ());
             Recorder.rShort((short)blockState);
-            Recorder.flush();
         }else{
             //Block packet
             Recorder.rByte(0x30);
@@ -176,8 +175,8 @@ public class RecordSystem {
             Recorder.rByte(pos.getY());
             Recorder.rInt(pos.getZ());
             Recorder.rInt(blockState);
-            Recorder.flush();
         }
+        Recorder.flush();
     }
 
     public static synchronized void particle(double x, double y, double z, String particleType){