Merge branch 'master' into coreHider

FightSystem_10/build.gradle

@@ -44,7 +44,7 @@ sourceSets {
 dependencies {
     implementation project(":FightSystem_Core")
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.10.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.10")
+    compileOnly swdep("WorldEdit-1.12")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_12/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     implementation project(":FightSystem_Core")
     implementation project(":FightSystem_8")
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.12.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.12")
+    compileOnly swdep("WorldEdit-1.12")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_14/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     implementation project(":FightSystem_9")
     implementation project(":FightSystem_8")
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.14.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.14")
+    compileOnly swdep("WorldEdit-1.15")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_15/build.gradle

@@ -44,7 +44,7 @@ sourceSets {
 dependencies {
     implementation project(":FightSystem_Core")
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.15.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.15")
+    compileOnly swdep("WorldEdit-1.15")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_18/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     compileOnly 'io.netty:netty-all:4.1.68.Final'
     compileOnly 'com.mojang:authlib:1.5.25'
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.18.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.18")
+    compileOnly swdep("WorldEdit-1.15")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_19/build.gradle

@@ -50,7 +50,7 @@ dependencies {
     compileOnly 'io.netty:netty-all:4.1.68.Final'
     compileOnly 'com.mojang:authlib:1.5.25'
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.19.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.19")
+    compileOnly swdep("WorldEdit-1.15")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_8/build.gradle

@@ -44,7 +44,7 @@ sourceSets {
 dependencies {
     implementation project(":FightSystem_Core")
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.8.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.8")
+    compileOnly swdep("WorldEdit-1.12")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_9/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     implementation project(":FightSystem_Core")
     implementation project(":FightSystem_8")
 
-    compileOnly files("${projectDir}/../lib/Spigot-1.9.jar")
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.12.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("Spigot-1.9")
+    compileOnly swdep("WorldEdit-1.12")
+    compileOnly swdep("SpigotCore")
 }

FightSystem_Core/build.gradle

@@ -47,6 +47,6 @@ dependencies {
     compileOnly 'io.netty:netty-all:4.1.68.Final'
     compileOnly 'com.mojang:authlib:1.5.25'
 
-    compileOnly files("${projectDir}/../lib/WorldEdit-1.15.jar")
-    compileOnly files("${projectDir}/../lib/SpigotCore.jar")
+    compileOnly swdep("WorldEdit-1.15")
+    compileOnly swdep("SpigotCore")
 }

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);
+    }
 }

FightSystem_Standalone/build.gradle

@@ -61,7 +61,7 @@ dependencies {
         }
     }
 
-    implementation files("${projectDir}/../lib/SpigotCore.jar")
+    implementation swdep("SpigotCore")
 }
 
 task fixPluginYML(type: Copy) {

build.gradle

@@ -35,6 +35,18 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '5.0.0'
 }
 
+ext.swdep = { s ->
+    if (file("${rootDir}/lib/${s}.jar").exists()) {
+        return files("${rootDir}/lib/${s}.jar")
+    } else {
+        if (s.contains("-")) {
+            return "de.steamwar:${s.toLowerCase().replace('-', ':')}"
+        } else {
+            return "de.steamwar:${s.toLowerCase()}:RELEASE"
+        }
+    }
+}
+
 group 'de.steamwar'
 version ''
 
@@ -82,6 +94,14 @@ allprojects {
         maven {
             url = uri('https://libraries.minecraft.net')
         }
+
+        maven {
+            url = uri('https://steamwar.de/maven')
+            credentials {
+                username = steamwarProperties.getProperty("maven.username")
+                password = steamwarProperties.getProperty("maven.password")
+            }
+        }
     }
 }