From c245f4c2ba1886cf72d92aff2b0be73069e13e17 Mon Sep 17 00:00:00 2001
From: MoBrot <90271578+MoBrot@users.noreply.github.com>
Date: Sun, 3 Jul 2022 16:02:47 +0200
Subject: [PATCH] Deleted BlockFromToListener Updated DragonTeleport in
 Permanent class

---
 .../de/steamwar/fightsystem/FightSystem.java  |  1 -
 .../listener/BlockFromToListener.java         | 31 -------------------
 .../fightsystem/listener/Permanent.java       | 17 ++++++++++
 3 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFromToListener.java

diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
index 4981e45..b449484 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java
@@ -77,7 +77,6 @@ public class FightSystem extends JavaPlugin {
         new DenyInventoryMovement();
         new EventJoin();
         new Recording();
-        new BlockFromToListener();
         //new ResourcePack();
         new Check();
         new Shutdown();
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFromToListener.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFromToListener.java
deleted file mode 100644
index 23b0eac..0000000
--- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/BlockFromToListener.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.steamwar.fightsystem.listener;
-
-import de.steamwar.fightsystem.ArenaMode;
-import de.steamwar.fightsystem.fight.Fight;
-import de.steamwar.fightsystem.states.FightState;
-import de.steamwar.fightsystem.states.StateDependentListener;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockFromToEvent;
-
-public class BlockFromToListener implements Listener {
-
-    public BlockFromToListener(){
-            new StateDependentListener(ArenaMode.All, FightState.All, this);
-    }
-
-    @EventHandler
-    public void onBlockFromTo(BlockFromToEvent event) {
-        if (Fight.getBlueTeam().getSchemRegion().inRegion(event.getBlock())
-                && Fight.getBlueTeam().getSchemRegion().inRegion(event.getToBlock())) {
-            return;
-        }
-
-        if (Fight.getRedTeam().getSchemRegion().inRegion(event.getBlock())
-                && Fight.getRedTeam().getSchemRegion().inRegion(event.getToBlock())) {
-            return;
-        }
-
-        event.setCancelled(true);
-    }
-}
diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java b/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
index 6f0b877..f5506f6 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
@@ -29,10 +29,12 @@ import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentListener;
 import net.md_5.bungee.api.ChatMessageType;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.entity.SpawnerSpawnEvent;
@@ -147,4 +149,19 @@ public class Permanent implements Listener {
         if(!Config.ArenaLeaveable)
             e.getWorld().setAutoSave(false);
     }
+
+    @EventHandler
+    public void onBlockFromTo(BlockFromToEvent event) {
+        if(event.getBlock().getType().equals(Material.DRAGON_EGG)) return;
+
+        for (FightTeam team : Fight.teams()) {
+            if(team.getExtendRegion().inRegion(event.getBlock())){
+
+                if(team.getExtendRegion().inRegion(event.getToBlock())) return;
+
+            }
+        }
+
+        event.setCancelled(true);
+    }
 }