Update SubServers.Console

ME1312 · Jun 13, 2021 · 910b504 · 910b504
1 parent de0e9a6
commit 910b504
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 206 deletions.
diff --git a/SubServers.Console/pom.xml b/SubServers.Console/pom.xml
@@ -18,8 +18,8 @@
         <dependency>
             <groupId>org.fusesource.jansi</groupId>
             <artifactId>jansi</artifactId>
-            <version>1.17.1</version>
-            <scope>provided</scope>
+            <version>1.18</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.intellij</groupId>

diff --git a/SubServers.Console/src/bungee.yml b/SubServers.Console/src/bungee.yml
@@ -1,4 +1,4 @@
 name: SubServers-Console
 main: net.ME1312.SubServers.Console.ConsolePlugin
-version: 2.16a
+version: 2.17a
 author: ME1312
diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleFont.ttf b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleFont.ttf
diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java
@@ -5,6 +5,7 @@
 import net.ME1312.SubServers.Bungee.Event.SubSendCommandEvent;
 import net.ME1312.SubServers.Bungee.Event.SubStartEvent;
 import net.ME1312.SubServers.Bungee.Host.Host;
+import net.ME1312.SubServers.Bungee.Host.RemotePlayer;
 import net.ME1312.SubServers.Bungee.Host.SubCreator;
 import net.ME1312.SubServers.Bungee.Host.SubServer;
 import net.ME1312.SubServers.Bungee.SubAPI;
@@ -19,6 +20,7 @@
 import javax.swing.*;
 import java.io.File;
 import java.io.IOException;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashMap;
 
@@ -103,7 +105,8 @@ public void onServerStart(SubStartEvent event) {
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onServerCommand(SubSendCommandEvent event) {
         if (!event.isCancelled() && sCurrent.keySet().contains(event.getServer().getName().toLowerCase())) {
-            sCurrent.get(event.getServer().getName().toLowerCase()).log('<' + ((event.getPlayer() == null)?"CONSOLE":((getProxy().getPlayer(event.getPlayer()) == null)?event.getPlayer().toString():getProxy().getPlayer(event.getPlayer()).getName())) + "> /" + event.getCommand());
+            RemotePlayer player = (event.getPlayer() == null)? null : SubAPI.getInstance().getRemotePlayer(event.getPlayer());
+            sCurrent.get(event.getServer().getName().toLowerCase()).log(((player == null)? "CONSOLE" : player.getName()) + "> /" + event.getCommand());
         }
     }