From 86e84575745e90320aad7f7031e9521ba93bb247 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Fri, 22 Jan 2021 23:34:47 +0100
Subject: [PATCH] Move to ServerLib

---
 Bukkit/build.gradle.kts                           | 15 ++++++++++++---
 .../com/plotsquared/bukkit/BukkitPlatform.java    |  3 +++
 build.gradle.kts                                  |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts
index 7fb1184f2..663db8d5a 100644
--- a/Bukkit/build.gradle.kts
+++ b/Bukkit/build.gradle.kts
@@ -27,9 +27,16 @@ repositories {
     }
 
     maven {
-        name = "IntellectualSites"
+        name = "IntellectualSites Releases"
         url = uri("https://mvn.intellectualsites.com/content/repositories/releases")
     }
+    maven {
+        name = "IntellectualSites 3rd Party"
+        url = uri("https://mvn.intellectualsites.com/content/repositories/thirdparty")
+        content {
+            includeGroup("de.notmyfault")
+        }
+    }
 }
 
 dependencies {
@@ -40,10 +47,10 @@ dependencies {
     //
 
     // Metrics
-    implementation("org.bstats:bstats-bukkit:1.7")
+    implementation("org.bstats:bstats-bukkit:1.8")
 
     // Minecraft
-    compileOnlyApi("com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT")
+    compileOnlyApi("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT")
     implementation("io.papermc:paperlib:1.0.6")
 
     // Plugins
@@ -62,6 +69,7 @@ dependencies {
 
     // Other libraries
     implementation("com.sk89q:squirrelid:1.0.0-SNAPSHOT") { isTransitive = false }
+    implementation("de.notmyfault:serverlib:1.0.0")
 
     // Our libraries
     implementation("com.intellectualsites.arkitektonika:Arkitektonika-Client:2.0-SNAPSHOT")
@@ -98,6 +106,7 @@ tasks.named<ShadowJar>("shadowJar") {
     relocate("com.intellectualsites.arkitektonika", "com.plotsquared.core.arkitektonika")
     relocate("com.intellectualsites.http", "com.plotsquared.core.http")
     relocate("com.intellectualsites.paster", "com.plotsquared.core.paster")
+    relocate("de.notmyfault:serverlib", "com.plotsquared.bukkit.serverlib")
 
     // Get rid of all the libs which are 100% unused.
     minimize()
diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
index 38f731827..63f9b6130 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@@ -117,6 +117,7 @@ import com.plotsquared.core.uuid.CacheUUIDService;
 import com.plotsquared.core.uuid.UUIDPipeline;
 import com.plotsquared.core.uuid.offline.OfflineModeUUIDService;
 import com.sk89q.worldedit.WorldEdit;
+import de.notmyfault.serverlib.ServerLib;
 import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
@@ -541,6 +542,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         // Check whether the server runs on 11 or greater
         checkJvm();
+        // Check if we are in a safe environment
+        ServerLib.checkUnsafeForks();
     }
 
     private void unload() {
diff --git a/build.gradle.kts b/build.gradle.kts
index 32e3e1301..ce3b8fe1c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     java
     `java-library`
     `maven-publish`
-    id("com.github.johnrengelman.shadow") version "6.0.0"
+    id("com.github.johnrengelman.shadow") version "6.1.0"
     id("net.minecrell.licenser") version "0.4.1"
     id("org.ajoberstar.grgit") version "4.1.0"