remove protocolsupport workaround, cleanup a bit

lucko · Jan 25, 2018 · af64508 · af64508
1 parent ad09705
commit af64508
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 120 deletions.
diff --git a/...ko/bungeeguard/backend/BackendPlugin.java → ...ard/backend/BungeeGuardBackendPlugin.java b/...ko/bungeeguard/backend/BackendPlugin.java → ...ard/backend/BungeeGuardBackendPlugin.java
@@ -26,7 +26,7 @@
  *
  * The token is included within the player's profile properties, but removed during the handshake.
  */
-public class BackendPlugin extends JavaPlugin implements Listener {
+public class BungeeGuardBackendPlugin extends JavaPlugin implements Listener {
     private static final Type PROPERTY_LIST_TYPE = new TypeToken<List<Property>>(){}.getType();
 
     @Getter
@@ -41,18 +41,8 @@ public class BackendPlugin extends JavaPlugin implements Listener {
 
     @Override
     public void onEnable() {
-
-        if (getServer().getPluginManager().isPluginEnabled("ProtocolSupport")) {
-            getLogger().info("Using ProtocolSupport hack");
-            try {
-                ProtocolSupportHack.hook(this);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            getLogger().info("Using Paper PlayerHandshakeEvent");
-            getServer().getPluginManager().registerEvents(this, this);
-        }
+        getLogger().info("Using Paper PlayerHandshakeEvent");
+        getServer().getPluginManager().registerEvents(this, this);
 
         saveDefaultConfig();
         FileConfiguration config = getConfig();

diff --git a/bungeeguard-backend/src/main/java/me/lucko/bungeeguard/backend/ProtocolSupportHack.java b/bungeeguard-backend/src/main/java/me/lucko/bungeeguard/backend/ProtocolSupportHack.java
diff --git a/bungeeguard-backend/src/main/resources/plugin.yml b/bungeeguard-backend/src/main/resources/plugin.yml
@@ -1,4 +1,3 @@
 name: BungeeGuard
 version: ${project.version}
-main: me.lucko.bungeeguard.backend.BackendPlugin
-softdepend: [ProtocolSupport]
+main: me.lucko.bungeeguard.backend.BungeeGuardBackendPlugin
diff --git a/.../lucko/bungeeguard/proxy/ProxyPlugin.java → ...eeguard/proxy/BungeeGuardProxyPlugin.java b/.../lucko/bungeeguard/proxy/ProxyPlugin.java → ...eeguard/proxy/BungeeGuardProxyPlugin.java
@@ -18,9 +18,9 @@
  * BungeeCord plugin which injects a special authentication token into a players
  * profile properties when they connect to a backend server.
  */
-public class ProxyPlugin extends Plugin implements Listener {
+public class BungeeGuardProxyPlugin extends Plugin implements Listener {
 
-    // characters to use to build our token
+    // characters to use to build a token
     private static final String TOKEN_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
     /**

diff --git a/bungeeguard-proxy/src/main/java/me/lucko/bungeeguard/proxy/SpoofedLoginResult.java b/bungeeguard-proxy/src/main/java/me/lucko/bungeeguard/proxy/SpoofedLoginResult.java
@@ -56,8 +56,8 @@ public Property[] getProperties() {
     }
 
     private Property[] getSpoofedProperties(Property[] properties) {
-        LoginResult.Property[] newProperties = Arrays.copyOf(properties, properties.length + 1);
-        newProperties[properties.length] = new LoginResult.Property("bungeeguard-token", extraToken, "");
+        Property[] newProperties = Arrays.copyOf(properties, properties.length + 1);
+        newProperties[properties.length] = new Property("bungeeguard-token", extraToken, "");
         return newProperties;
     }
 

diff --git a/bungeeguard-proxy/src/main/resources/plugin.yml b/bungeeguard-proxy/src/main/resources/plugin.yml
@@ -1,3 +1,3 @@
 name: BungeeGuard
 version: ${project.version}
-main: me.lucko.bungeeguard.proxy.ProxyPlugin
+main: me.lucko.bungeeguard.proxy.BungeeGuardProxyPlugin