FightSystem_Main/src/de/steamwar/fightsystem/listener/Recording.java

@@ -111,7 +111,7 @@ public class Recording implements Listener {
             public void disable() {
                 ProtocolLibrary.getProtocolManager().removePacketListener(BOW_PACKET_PROCESSOR);
             }
-        };
+        }.register();
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
@@ -157,7 +157,7 @@ public class Recording implements Listener {
         if(e.getEntityType() != EntityType.PLAYER)
             return;
 
-        if(e.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK || e.getCause() == EntityDamageEvent.DamageCause.FIRE ||e.getEntity().getFireTicks() > 0)
+        if(e.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK || e.getCause() == EntityDamageEvent.DamageCause.FIRE)
             RecordSystem.setOnFire(e.getEntity(), false);
 
 
@@ -168,6 +168,14 @@ public class Recording implements Listener {
         RecordSystem.damageAnimation(p);
     }
 
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityCombust(EntityCombustEvent e) {
+        if(e.getEntityType() != EntityType.PLAYER)
+            return;
+
+        RecordSystem.setOnFire(e.getEntity(), false);
+    }
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onTNTSpawn(EntitySpawnEvent e){
         //TODO: Falling block