diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java
index 73284cd..6e60e5c 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventJoinListener.java
@@ -82,10 +82,15 @@ public class EventJoinListener extends BasicListener {
             FightPlayer fp = team.addMember(player);
             if(!team.hasTeamLeader())
                 team.setLeader(fp);
+            return;
         }
 
-        if(user.getId() == FightSystem.getEventFight().getKampfleiter())
+        if(user.getId() == FightSystem.getEventFight().getKampfleiter()){
             FightSystem.setEventLeiter(player);
+            return;
+        }
+        if(Config.SpectateSystem)
+            player.kickPlayer("§cDu bist kein Kampfteilnehmer");
     }
 
     @EventHandler
diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
index 12ed538..7b690a1 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/EventRecordListener.java
@@ -104,9 +104,8 @@ public class EventRecordListener extends BasicListener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockPhysics(BlockPhysicsEvent e){
-        if(e.getBlock() != e.getSourceBlock())
-            return;
-        RecordSystem.blockChange(e.getBlock());
+        if(e.getBlock() == e.getSourceBlock() || e.getChangedType() == Material.AIR)
+            RecordSystem.blockChange(e.getBlock());
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)