Revert parts of "Allow force disconnecting of a player" to prevent player issues (#520)

0utplay · web-flow · commit a4619bca9386 · 2021-07-16T21:27:09.000+02:00
diff --git a/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/player/NodePlayerManager.java b/cloudnet-modules/cloudnet-bridge/src/main/java/de/dytanic/cloudnet/ext/bridge/node/player/NodePlayerManager.java
@@ -585,12 +585,9 @@ private void logoutPlayer(UUID uniqueId, String name, Predicate<CloudPlayer> pre
       }
     } else {
       cloudPlayer = this.getFirstOnlinePlayer(name);
-      if (cloudPlayer == null || (predicate != null && !predicate.test(cloudPlayer))) {
-        return;
-      }
     }
 
-    if (cloudPlayer != null) {
+    if (cloudPlayer != null && (predicate == null || predicate.test(cloudPlayer))) {
       this.logoutPlayer(cloudPlayer);
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -585,12 +585,9 @@ private void logoutPlayer(UUID uniqueId, String name, Predicate<CloudPlayer> pre`
`585`	`585`	`}`
`586`	`586`	`} else {`
`587`	`587`	`cloudPlayer = this.getFirstOnlinePlayer(name);`
`588`		`- if (cloudPlayer == null \|\| (predicate != null && !predicate.test(cloudPlayer))) {`
`589`		`- return;`
`590`		`- }`
`591`	`588`	`}`
`592`	`589`
`593`		`- if (cloudPlayer != null) {`
	`590`	`+ if (cloudPlayer != null && (predicate == null \|\| predicate.test(cloudPlayer))) {`
`594`	`591`	`this.logoutPlayer(cloudPlayer);`
`595`	`592`	`}`
`596`	`593`	`}`