Changelog:

* Code Improvement

Author: TheProgramSrc

SuperCoreAPI.iml

@@ -50,13 +50,13 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.xerial:sqlite-jdbc:3.25.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.13.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.0-M1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0-M1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter:5.7.0-RC1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0-RC1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.0-M1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.0-M1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0-M1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0-M1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.7.0-RC1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-params:5.7.0-RC1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0-RC1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.7.0-RC1" level="project" />
   </component>
 </module>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>xyz.theprogramsrc</groupId>
     <artifactId>SuperCoreAPI</artifactId>
-    <version>4.1.3</version>
+    <version>4.1.4</version>
     <packaging>jar</packaging>
 
     <name>SuperCoreAPI</name>

src/main/java/xyz/theprogramsrc/supercoreapi/global/utils/ServerUtils.java

@@ -14,11 +14,33 @@ public ServerUtils(SuperPlugin<?> plugin){
     }
 
     /**
-     * Send a Player to another Server (Bukkit)
-     * @param player Player to send
-     * @param server Name of the Server to send
+     * Send a player to another server
+     * @param player the player
+     * @param server the server
      */
-    public void sendToServer(org.bukkit.entity.Player player, String server){
+    public void sendToServer(Object player, String server){
+        boolean canBungee = false;
+        try{
+            Class.forName("net.md_5.bungee.api.connection.ProxiedPlayer");
+            canBungee = true;
+        }catch (ClassNotFoundException ignored){ }
+
+        if(canBungee){
+            if(player instanceof net.md_5.bungee.api.connection.ProxiedPlayer){
+                this.sendToServerBungee(((net.md_5.bungee.api.connection.ProxiedPlayer)player), server);
+            }else{
+                this.sendToServerBukkit(((org.bukkit.entity.Player)player), server);
+            }
+        }else{
+            if(player instanceof org.bukkit.entity.Player){
+                this.sendToServerBukkit(((org.bukkit.entity.Player)player), server);
+            }else{
+                throw new IllegalArgumentException("The argument 'player' must be org.bukkit.entity.Player or net.md_5.bungee.api.connection.ProxiedPlayer");
+            }
+        }
+    }
+
+    private void sendToServerBukkit(org.bukkit.entity.Player player, String server){
         if(!((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()).getServer().getMessenger().isOutgoingChannelRegistered(((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()), "BungeeCord")){
             ((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()).getServer().getMessenger().registerOutgoingPluginChannel(((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()), "BungeeCord");
         }
@@ -35,12 +57,7 @@ public void sendToServer(org.bukkit.entity.Player player, String server){
         player.sendPluginMessage(((org.bukkit.plugin.java.JavaPlugin)this.plugin.getPlugin()), "BungeeCord", byteArrayOutputStream.toByteArray());
     }
 
-    /**
-     * Send a Player to another Server (Bungee)
-     * @param player Player to send
-     * @param server Name of the Server to send
-     */
-    public void sendToServer(net.md_5.bungee.api.connection.ProxiedPlayer player, String server){
+    private void sendToServerBungee(net.md_5.bungee.api.connection.ProxiedPlayer player, String server){
         ((net.md_5.bungee.api.plugin.Plugin)this.plugin).getProxy().registerChannel("BungeeCord");
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         DataOutputStream dataOutputStream = new DataOutputStream(byteArrayOutputStream);