added reason for an unverfied login

Dytanic · Dytanic · commit 7fd5012be2ba · 2018-11-17T17:59:26.000+01:00
diff --git a/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/listener/proxied/ProxiedListener.java b/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/listener/proxied/ProxiedListener.java
@@ -125,13 +125,15 @@ public void handleLogin(LoginEvent e)
                 e.getConnection().isLegacy()
         );
 
-        CloudPlayer cloudPlayer = CloudAPI.getInstance().getNetworkConnection().getPacketManager().sendQuery(new PacketOutPlayerLoginRequest(playerConnection),
-                CloudAPI.getInstance().getNetworkConnection()).getResult().getObject("player", new TypeToken<CloudPlayer>() {
+        Document result = CloudAPI.getInstance().getNetworkConnection().getPacketManager().sendQuery(new PacketOutPlayerLoginRequest(playerConnection),
+                CloudAPI.getInstance().getNetworkConnection()).getResult();
+
+        CloudPlayer cloudPlayer = result.getObject("player", new TypeToken<CloudPlayer>() {
         }.getType());
 
         if (cloudPlayer == null)
         {
-            e.setCancelReason(TextComponent.fromLegacyText("§cUnverified login."));
+            e.setCancelReason(TextComponent.fromLegacyText("§cUnverified login. Reason: §e" + (result.contains("reason") ? result.getString("reason") : "no reason defined")));
             e.setCancelled(true);
             return;
         }
diff --git a/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/NetworkManager.java b/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/NetworkManager.java
@@ -87,15 +87,14 @@ public void handlePlayerLoginRequest(ProxyServer proxyServer, PlayerConnection c
     {
         if (this.onlinePlayers.containsKey(cloudPlayerConnection.getUniqueId()))
         {
-            proxyServer.sendPacketSynchronized(new PacketOutLoginPlayer(uniqueId, null));
+            proxyServer.sendPacketSynchronized(new PacketOutLoginPlayer(uniqueId, null, "Already connected in network"));
             return;
         }
 
         LoginRequestEvent loginRequestEvent = new LoginRequestEvent(proxyServer, cloudPlayerConnection);
         CloudNet.getInstance().getEventManager().callEvent(loginRequestEvent);
 
         PlayerDatabase playerDatabase = CloudNet.getInstance().getDbHandlers().getPlayerDatabase();
-
         OfflinePlayer offlinePlayer = null;
 
         if (!playerDatabase.containsPlayer(cloudPlayerConnection.getUniqueId()))
@@ -116,7 +115,7 @@ public void handlePlayerLoginRequest(ProxyServer proxyServer, PlayerConnection c
         cloudPlayer.setName(cloudPlayerConnection.getName());
         CloudNet.getInstance().getDbHandlers().getPlayerDatabase().updatePlayer(CloudPlayer.newOfflinePlayer(cloudPlayer));
 
-        proxyServer.sendPacketSynchronized(new PacketOutLoginPlayer(uniqueId, cloudPlayer));
+        proxyServer.sendPacket(new PacketOutLoginPlayer(uniqueId, cloudPlayer, "successful Login"));
         this.waitingPlayers.put(cloudPlayer.getUniqueId(), cloudPlayer);
         handlePlayerLogin(cloudPlayer);
     }
@@ -141,14 +140,14 @@ public void handlePlayerLogout(CloudPlayer playerWhereAmI)
         try
         {
             System.out.println("Player [" + playerWhereAmI.getName() + NetworkUtils.SLASH_STRING + playerWhereAmI.getUniqueId() + NetworkUtils.SLASH_STRING + playerWhereAmI.getPlayerConnection().getHost() + "] is disconnected on " + playerWhereAmI.getProxy());
-        } catch (Exception ex)
+        } catch (Exception ignored)
         {
         }
 
         try
         {
             this.onlinePlayers.remove(playerWhereAmI.getUniqueId());
-        } catch (Exception ex)
+        } catch (Exception ignored)
         {
 
         }
@@ -160,7 +159,7 @@ public void handlePlayerLogout(CloudPlayer playerWhereAmI)
             playerWhereAmI.setLastLogin(System.currentTimeMillis());
             playerWhereAmI.setLastPlayerConnection(playerWhereAmI.getPlayerConnection());
             CloudNet.getInstance().getDbHandlers().getPlayerDatabase().updatePlayer(CloudPlayer.newOfflinePlayer(playerWhereAmI));
-        } catch (Exception ex)
+        } catch (Exception ignored)
         {
 
         }
@@ -175,7 +174,7 @@ public void handlePlayerLogout(UUID uniqueId, ProxyServer proxyServer)
         try
         {
             this.onlinePlayers.remove(uniqueId);
-        } catch (Exception ex)
+        } catch (Exception ignored)
         {
         }
 
diff --git a/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/packet/in/PacketInPlayerLoginRequest.java b/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/packet/in/PacketInPlayerLoginRequest.java
@@ -18,6 +18,7 @@ public final class PacketInPlayerLoginRequest extends PacketInHandler {
     public void handleInput(Document data, PacketSender packetSender)
     {
         if (!(packetSender instanceof ProxyServer) && packetUniqueId != null) return;
+
         PlayerConnection playerConnection = data.getObject("playerConnection", new TypeToken<PlayerConnection>() {
         }.getType());
         CloudNet.getInstance().getNetworkManager().handlePlayerLoginRequest(((ProxyServer) packetSender), playerConnection, packetUniqueId);
diff --git a/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/packet/out/PacketOutLoginPlayer.java b/cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/packet/out/PacketOutLoginPlayer.java
@@ -21,8 +21,8 @@ public PacketOutLoginPlayer(CloudPlayer cloudPlayer)
         super(PacketRC.PLAYER_HANDLE + 1, new Document("player", cloudPlayer));
     }
 
-    public PacketOutLoginPlayer(UUID uniqueId, CloudPlayer cloudPlayer)
+    public PacketOutLoginPlayer(UUID uniqueId, CloudPlayer cloudPlayer, String reason)
     {
-        super(uniqueId, PacketRC.PLAYER_HANDLE + 1, new Document("player", cloudPlayer));
+        super(uniqueId, PacketRC.PLAYER_HANDLE + 1, new Document("player", cloudPlayer).append("reason", reason));
     }
 }
diff --git a/cloudnet-lib/src/main/java/de/dytanic/cloudnet/lib/network/protocol/packet/PacketManager.java b/cloudnet-lib/src/main/java/de/dytanic/cloudnet/lib/network/protocol/packet/PacketManager.java
@@ -64,18 +64,17 @@ public PacketManager queuePacket(Packet packet)
     public PacketManager dispatchQueue(PacketSender packetSender)
     {
         while (!this.packetQueue.isEmpty())
-        {
             packetSender.sendPacket(this.packetQueue.remove());
-        }
+
         return this;
     }
 
     public Result sendQuery(Packet packet, PacketSender packetSender)
     {
-        UUID uniq = UUID.randomUUID();
-        packet.uniqueId = uniq;
+        UUID uniqueId = UUID.randomUUID();
+        packet.uniqueId = uniqueId;
         Value<Result> handled = new Value<>(null);
-        synchronizedHandlers.put(uniq, handled);
+        synchronizedHandlers.put(uniqueId, handled);
         executorService.schedule(new Runnable() {
             @Override
             public void run()
@@ -84,20 +83,20 @@ public void run()
             }
         });
 
-        short i = 0;
+        int i = 0;
 
-        while (synchronizedHandlers.get(uniq).getValue() == null && i++ < 5000)
+        while (synchronizedHandlers.get(uniqueId).getValue() == null && i++ < 5000)
             try
             {
-                Thread.sleep(0, 300000);
+                Thread.sleep(0, 500000);
             } catch (InterruptedException ignored)
             {
             }
 
-        if (i >= 200) synchronizedHandlers.get(uniq).setValue(new Result(uniq, new Document()));
+        if (i >= 200) synchronizedHandlers.get(uniqueId).setValue(new Result(uniqueId, new Document()));
 
-        Value<Result> values = synchronizedHandlers.get(uniq);
-        synchronizedHandlers.remove(uniq);
+        Value<Result> values = synchronizedHandlers.get(uniqueId);
+        synchronizedHandlers.remove(uniqueId);
         return values.getValue();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,15 +87,14 @@ public void handlePlayerLoginRequest(ProxyServer proxyServer, PlayerConnection c`
`87`	`87`	`{`
`88`	`88`	`if (this.onlinePlayers.containsKey(cloudPlayerConnection.getUniqueId()))`
`89`	`89`	`{`
`90`		`- proxyServer.sendPacketSynchronized(new PacketOutLoginPlayer(uniqueId, null));`
	`90`	`+ proxyServer.sendPacketSynchronized(new PacketOutLoginPlayer(uniqueId, null, "Already connected in network"));`
`91`	`91`	`return;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`LoginRequestEvent loginRequestEvent = new LoginRequestEvent(proxyServer, cloudPlayerConnection);`
`95`	`95`	`CloudNet.getInstance().getEventManager().callEvent(loginRequestEvent);`
`96`	`96`
`97`	`97`	`PlayerDatabase playerDatabase = CloudNet.getInstance().getDbHandlers().getPlayerDatabase();`
`98`		`-`
`99`	`98`	`OfflinePlayer offlinePlayer = null;`
`100`	`99`
`101`	`100`	`if (!playerDatabase.containsPlayer(cloudPlayerConnection.getUniqueId()))`
`@@ -116,7 +115,7 @@ public void handlePlayerLoginRequest(ProxyServer proxyServer, PlayerConnection c`
`116`	`115`	`cloudPlayer.setName(cloudPlayerConnection.getName());`
`117`	`116`	`CloudNet.getInstance().getDbHandlers().getPlayerDatabase().updatePlayer(CloudPlayer.newOfflinePlayer(cloudPlayer));`
`118`	`117`
`119`		`- proxyServer.sendPacketSynchronized(new PacketOutLoginPlayer(uniqueId, cloudPlayer));`
	`118`	`+ proxyServer.sendPacket(new PacketOutLoginPlayer(uniqueId, cloudPlayer, "successful Login"));`
`120`	`119`	`this.waitingPlayers.put(cloudPlayer.getUniqueId(), cloudPlayer);`
`121`	`120`	`handlePlayerLogin(cloudPlayer);`
`122`	`121`	`}`
`@@ -141,14 +140,14 @@ public void handlePlayerLogout(CloudPlayer playerWhereAmI)`
`141`	`140`	`try`
`142`	`141`	`{`
`143`	`142`	`System.out.println("Player [" + playerWhereAmI.getName() + NetworkUtils.SLASH_STRING + playerWhereAmI.getUniqueId() + NetworkUtils.SLASH_STRING + playerWhereAmI.getPlayerConnection().getHost() + "] is disconnected on " + playerWhereAmI.getProxy());`
`144`		`- } catch (Exception ex)`
	`143`	`+ } catch (Exception ignored)`
`145`	`144`	`{`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`try`
`149`	`148`	`{`
`150`	`149`	`this.onlinePlayers.remove(playerWhereAmI.getUniqueId());`
`151`		`- } catch (Exception ex)`
	`150`	`+ } catch (Exception ignored)`
`152`	`151`	`{`
`153`	`152`
`154`	`153`	`}`
`@@ -160,7 +159,7 @@ public void handlePlayerLogout(CloudPlayer playerWhereAmI)`
`160`	`159`	`playerWhereAmI.setLastLogin(System.currentTimeMillis());`
`161`	`160`	`playerWhereAmI.setLastPlayerConnection(playerWhereAmI.getPlayerConnection());`
`162`	`161`	`CloudNet.getInstance().getDbHandlers().getPlayerDatabase().updatePlayer(CloudPlayer.newOfflinePlayer(playerWhereAmI));`
`163`		`- } catch (Exception ex)`
	`162`	`+ } catch (Exception ignored)`
`164`	`163`	`{`
`165`	`164`
`166`	`165`	`}`
`@@ -175,7 +174,7 @@ public void handlePlayerLogout(UUID uniqueId, ProxyServer proxyServer)`
`175`	`174`	`try`
`176`	`175`	`{`
`177`	`176`	`this.onlinePlayers.remove(uniqueId);`
`178`		`- } catch (Exception ex)`
	`177`	`+ } catch (Exception ignored)`
`179`	`178`	`{`
`180`	`179`	`}`
`181`	`180`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ public final class PacketInPlayerLoginRequest extends PacketInHandler {`
`18`	`18`	`public void handleInput(Document data, PacketSender packetSender)`
`19`	`19`	`{`
`20`	`20`	`if (!(packetSender instanceof ProxyServer) && packetUniqueId != null) return;`
	`21`	`+`
`21`	`22`	`PlayerConnection playerConnection = data.getObject("playerConnection", new TypeToken<PlayerConnection>() {`
`22`	`23`	`}.getType());`
`23`	`24`	`CloudNet.getInstance().getNetworkManager().handlePlayerLoginRequest(((ProxyServer) packetSender), playerConnection, packetUniqueId);`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public PacketOutLoginPlayer(CloudPlayer cloudPlayer)`
`21`	`21`	`super(PacketRC.PLAYER_HANDLE + 1, new Document("player", cloudPlayer));`
`22`	`22`	`}`
`23`	`23`
`24`		`- public PacketOutLoginPlayer(UUID uniqueId, CloudPlayer cloudPlayer)`
	`24`	`+ public PacketOutLoginPlayer(UUID uniqueId, CloudPlayer cloudPlayer, String reason)`
`25`	`25`	`{`
`26`		`- super(uniqueId, PacketRC.PLAYER_HANDLE + 1, new Document("player", cloudPlayer));`
	`26`	`+ super(uniqueId, PacketRC.PLAYER_HANDLE + 1, new Document("player", cloudPlayer).append("reason", reason));`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,18 +64,17 @@ public PacketManager queuePacket(Packet packet)`
`64`	`64`	`public PacketManager dispatchQueue(PacketSender packetSender)`
`65`	`65`	`{`
`66`	`66`	`while (!this.packetQueue.isEmpty())`
`67`		`- {`
`68`	`67`	`packetSender.sendPacket(this.packetQueue.remove());`
`69`		`- }`
	`68`	`+`
`70`	`69`	`return this;`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`public Result sendQuery(Packet packet, PacketSender packetSender)`
`74`	`73`	`{`
`75`		`- UUID uniq = UUID.randomUUID();`
`76`		`- packet.uniqueId = uniq;`
	`74`	`+ UUID uniqueId = UUID.randomUUID();`
	`75`	`+ packet.uniqueId = uniqueId;`
`77`	`76`	`Value<Result> handled = new Value<>(null);`
`78`		`- synchronizedHandlers.put(uniq, handled);`
	`77`	`+ synchronizedHandlers.put(uniqueId, handled);`
`79`	`78`	`executorService.schedule(new Runnable() {`
`80`	`79`	`@Override`
`81`	`80`	`public void run()`
`@@ -84,20 +83,20 @@ public void run()`
`84`	`83`	`}`
`85`	`84`	`});`
`86`	`85`
`87`		`- short i = 0;`
	`86`	`+ int i = 0;`
`88`	`87`
`89`		`- while (synchronizedHandlers.get(uniq).getValue() == null && i++ < 5000)`
	`88`	`+ while (synchronizedHandlers.get(uniqueId).getValue() == null && i++ < 5000)`
`90`	`89`	`try`
`91`	`90`	`{`
`92`		`- Thread.sleep(0, 300000);`
	`91`	`+ Thread.sleep(0, 500000);`
`93`	`92`	`} catch (InterruptedException ignored)`
`94`	`93`	`{`
`95`	`94`	`}`
`96`	`95`
`97`		`- if (i >= 200) synchronizedHandlers.get(uniq).setValue(new Result(uniq, new Document()));`
	`96`	`+ if (i >= 200) synchronizedHandlers.get(uniqueId).setValue(new Result(uniqueId, new Document()));`
`98`	`97`
`99`		`- Value<Result> values = synchronizedHandlers.get(uniq);`
`100`		`- synchronizedHandlers.remove(uniq);`
	`98`	`+ Value<Result> values = synchronizedHandlers.get(uniqueId);`
	`99`	`+ synchronizedHandlers.remove(uniqueId);`
`101`	`100`	`return values.getValue();`
`102`	`101`	`}`
`103`	`102`