From 14741afb8d5a32529b38a0365c29aac6ee1a800f Mon Sep 17 00:00:00 2001
From: JaTiTV <info.jatitv@gmail.com>
Date: Thu, 14 Jul 2022 21:37:58 +0200
Subject: [PATCH] 12.5

---
 pom.xml                                       |  2 +-
 .../lib/Spigot/Lib/plugins/PluginCheck.java   |  3 ++
 .../Spigot/Lib/plugins/T2CPluginManager.java  | 30 +++++++++++++++----
 .../t2code/lib/Spigot/system/T2CodeMain.java  |  5 ----
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1830d0c..77198cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <version>12.4</version>
+    <version>12.5</version>
     <!-- <classifier>dev-1</classifier> -->
 
     <groupId>net.t2code</groupId>
diff --git a/src/main/java/net/t2code/lib/Spigot/Lib/plugins/PluginCheck.java b/src/main/java/net/t2code/lib/Spigot/Lib/plugins/PluginCheck.java
index 7438042..29c5efc 100644
--- a/src/main/java/net/t2code/lib/Spigot/Lib/plugins/PluginCheck.java
+++ b/src/main/java/net/t2code/lib/Spigot/Lib/plugins/PluginCheck.java
@@ -40,6 +40,9 @@ public class PluginCheck {
     public static Boolean cgui(){
          return Bukkit.getPluginManager().getPlugin("CommandGUI") != null;
     }
+    public static Boolean functiongui(){
+         return Bukkit.getPluginManager().getPlugin("T2C-CommandGUI") != null;
+    }
     public static Boolean plotSquaredGUI(){
          return Bukkit.getPluginManager().getPlugin("PlotSquaredGUI") != null;
     }
diff --git a/src/main/java/net/t2code/lib/Spigot/Lib/plugins/T2CPluginManager.java b/src/main/java/net/t2code/lib/Spigot/Lib/plugins/T2CPluginManager.java
index f70ef77..0c00cb4 100644
--- a/src/main/java/net/t2code/lib/Spigot/Lib/plugins/T2CPluginManager.java
+++ b/src/main/java/net/t2code/lib/Spigot/Lib/plugins/T2CPluginManager.java
@@ -1,22 +1,42 @@
 package net.t2code.lib.Spigot.Lib.plugins;
 
+import net.t2code.lib.Spigot.system.T2CodeMain;
 import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
 
 import java.util.Objects;
 
 public class T2CPluginManager {
 
     public static void restart(String plugin) {
-
-        Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)).onEnable();
-        Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)).onDisable();
+        if (Bukkit.getPluginManager().getPlugin(plugin) == null) return;
+        T2CodeMain.getPlugin().getPluginLoader().disablePlugin(Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)));
+        T2CodeMain.getPlugin().getPluginLoader().enablePlugin(Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)));
     }
 
     public static void enable(String plugin) {
-        Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)).onEnable();
+        if (Bukkit.getPluginManager().getPlugin(plugin) == null) return;
+        T2CodeMain.getPlugin().getPluginLoader().enablePlugin(Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)));
     }
 
     public static void disable(String plugin) {
-        Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)).onDisable();
+        if (Bukkit.getPluginManager().getPlugin(plugin) == null) return;
+        T2CodeMain.getPlugin().getPluginLoader().disablePlugin(Objects.requireNonNull(Bukkit.getPluginManager().getPlugin(plugin)));
+    }
+
+    public static void restart(Plugin plugin) {
+        if (plugin == null) return;
+        T2CodeMain.getPlugin().getPluginLoader().disablePlugin(plugin);
+        T2CodeMain.getPlugin().getPluginLoader().enablePlugin(plugin);
+    }
+
+    public static void enable(Plugin plugin) {
+        if (plugin == null) return;
+        T2CodeMain.getPlugin().getPluginLoader().enablePlugin(plugin);
+    }
+
+    public static void disable(Plugin plugin) {
+        if (plugin == null) return;
+        T2CodeMain.getPlugin().getPluginLoader().disablePlugin(plugin);
     }
 }
diff --git a/src/main/java/net/t2code/lib/Spigot/system/T2CodeMain.java b/src/main/java/net/t2code/lib/Spigot/system/T2CodeMain.java
index 3dfc3fc..a44d325 100644
--- a/src/main/java/net/t2code/lib/Spigot/system/T2CodeMain.java
+++ b/src/main/java/net/t2code/lib/Spigot/system/T2CodeMain.java
@@ -110,11 +110,6 @@ public final class T2CodeMain extends JavaPlugin {
             send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected." +
                     " Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!");
             send.console(prefix + " §4    §e-------------------");
-            try {
-                Thread.sleep(5000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
         }
 
         try {