Allow Forge to not kick a player, too.

I haven't implemented any Forge events, since I am 100% unfamiliar with Forge.
MCLink-Modding · Feb 19, 2018 · 80e7005 · 80e7005
1 parent 87af64b
commit 80e7005
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/1.10.2/src/main/java/net/dries007/mclink/MCLink.java b/1.10.2/src/main/java/net/dries007/mclink/MCLink.java
@@ -108,6 +108,8 @@ public void loginEvent(PlayerLoggedInEvent event)
     @Override
     protected void authCompleteAsync(IPlayer player, String msg, UUID name, ImmutableCollection<Authentication> authentications)
     {
+        // null authentications means "kick"
+        if (authentications != null) return;
         server.addScheduledTask(() -> {
             EntityPlayerMP p = server.getPlayerList().getPlayerByUUID(player.getUuid());
             //noinspection ConstantConditions

diff --git a/1.12.2/src/main/java/net/dries007/mclink/MCLink.java b/1.12.2/src/main/java/net/dries007/mclink/MCLink.java
@@ -98,6 +98,8 @@ public void loginEvent(PlayerLoggedInEvent event)
     @Override
     protected void authCompleteAsync(IPlayer player, String msg, UUID name, ImmutableCollection<Authentication> authentications)
     {
+        // null authentications means "kick"
+        if (authentications != null) return;
         server.addScheduledTask(() -> {
             EntityPlayerMP p = server.getPlayerList().getPlayerByUUID(player.getUuid());
             //noinspection ConstantConditions

diff --git a/1.12/src/main/java/net/dries007/mclink/MCLink.java b/1.12/src/main/java/net/dries007/mclink/MCLink.java
@@ -105,6 +105,8 @@ public void loginEvent(PlayerLoggedInEvent event)
     @Override
     protected void authCompleteAsync(IPlayer player, String msg, UUID name, ImmutableCollection<Authentication> authentications)
     {
+        // null authentications means "kick"
+        if (authentications != null) return;
         server.addScheduledTask(() -> {
             EntityPlayerMP p = server.getPlayerList().getPlayerByUUID(player.getUuid());
             //noinspection ConstantConditions

diff --git a/1.7.10/src/main/java/net/dries007/mclink/MCLink.java b/1.7.10/src/main/java/net/dries007/mclink/MCLink.java
@@ -146,6 +146,8 @@ public void tickEvent(TickEvent.ServerTickEvent event)
     @Override
     protected void authCompleteAsync(IPlayer player, String msg, UUID name, ImmutableCollection<Authentication> authentications)
     {
+        // null authentications means "kick"
+        if (authentications != null) return;
         // 1.7.10 doesn't have threading, so use server tick even to sync.
         TO_KICK.put(player.getName(), msg);
     }