diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java index cf37123..53486b5 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -132,7 +132,7 @@ public class FightTeam { new OneShotStateDependent(ArenaMode.Restartable, FightState.PreLeaderSetup, () -> Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::reset)); new OneShotStateDependent(Config.replayserver(), FightState.PreLeaderSetup, () -> Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::reset)); - new OneShotStateDependent(ArenaMode.AntiTest, FightState.PostSchemSetup, () -> { + new OneShotStateDependent(ArenaMode.All, FightState.PostSchemSetup, () -> { if(leader != null) notReadyKit.loadToPlayer(leader.getPlayer()); }); diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java index 2850476..4ad97c9 100644 --- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java +++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/DenyWorldInteraction.java @@ -30,6 +30,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.ProjectileLaunchEvent; @@ -74,6 +75,12 @@ public class DenyWorldInteraction implements Listener { event.setCancelled(true); } + @EventHandler + public void handleBlockBurn(BlockIgniteEvent event) { + if(!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(event.getBlock())) + event.setCancelled(true); + } + @EventHandler public void handlePlayerKickEvent(PlayerKickEvent e){ if(e.getReason().contains("Flying is not enabled"))