Supplement OfflinePlayer#hasPlayedBefore checks with #isOnline checks

md5sha256 · Aug 8, 2024 · 2762eba · 2762eba
1 parent 5742dd6
commit 2762eba
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 16 deletions.
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/AddFriendCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/AddFriendCommand.java
@@ -88,7 +88,7 @@ private void handleCommand(CommandContext<PlayerCommandSource> context) {
                         exception.printStackTrace();
                         return;
                     }
-                    if (!offlinePlayer.hasPlayedBefore()) {
+                    if (!offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", offlinePlayer.getName());
                         return;
                     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java
@@ -111,7 +111,7 @@ private void handleCommand(@Nonnull CommandContext<CommandSource<?>> context) {
                         exception.printStackTrace();
                         return;
                     }
-                    if (!offlinePlayer.hasPlayedBefore()) {
+                    if (!offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", offlinePlayer.getName());
                         return;
                     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/InfoPlayerCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/InfoPlayerCommand.java
@@ -76,7 +76,7 @@ private void handleCommand(@Nonnull CommandContext<CommandSource<?>> context) {
                         exception.printStackTrace();
                         return;
                     }
-                    if (!offlinePlayer.hasPlayedBefore()) {
+                    if (!offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", offlinePlayer.getName());
                         return;
                     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/MeCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/MeCommand.java
@@ -87,7 +87,7 @@ private void handleCommand(@Nonnull CommandContext<PlayerCommandSource> context)
                         exception.printStackTrace();
                         return;
                     }
-                    if (!offlinePlayer.hasPlayedBefore()) {
+                    if (!offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", offlinePlayer.getName());
                         return;
                     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/QuickRentCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/QuickRentCommand.java
@@ -113,7 +113,7 @@ private void handleCommand(@Nonnull CommandContext<PlayerCommandSource> context)
                                     exception.printStackTrace();
                                     return;
                                 }
-                                if (!landlord.hasPlayedBefore()) {
+                                if (!landlord.hasPlayedBefore() && !landlord.isOnline()) {
                                     this.messageBridge.message(player, "cmd-invalidPlayer", landlord.getName());
                                     return;
                                 }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetLandlordCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetLandlordCommand.java
@@ -86,7 +86,7 @@ private void handleCommand(@Nonnull CommandContext<CommandSource<?>> context) {
                         exception.printStackTrace();
                         return;
                     }
-                    if (!landlord.hasPlayedBefore()) {
+                    if (!landlord.hasPlayedBefore() && !landlord.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", landlord.getName());
                         return;
                     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetOwnerCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/SetOwnerCommand.java
@@ -98,7 +98,7 @@ private void handleCommand(@Nonnull CommandContext<CommandSource<?>> context) {
                         exception.printStackTrace();
                         return;
                     }
-                    if (!offlinePlayer.hasPlayedBefore()) {
+                    if (!offlinePlayer.hasPlayedBefore() && !offlinePlayer.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", offlinePlayer.getName());
                         return;
                     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/TransferCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/TransferCommand.java
@@ -101,7 +101,7 @@ private void handleCommand(@Nonnull CommandContext<PlayerCommandSource> context)
                         exception.printStackTrace();
                         return;
                     }
-                    if (!offlinePlayer.hasPlayedBefore()) {
+                    if (!offlinePlayer.hasPlayedBefore() &&!offlinePlayer.isOnline()) {
                         this.messageBridge.message(sender, "cmd-invalidPlayer", offlinePlayer.getName());
                         return;
                     }
@@ -119,7 +119,7 @@ private void performTransfer(
         if (Objects.equals(sender, targetPlayer)) {
             throw new AreaShopCommandException("transfer-transferSelf");
         }
-        if (!targetPlayer.hasPlayedBefore()) {
+        if (!targetPlayer.hasPlayedBefore() && !targetPlayer.isOnline()) {
             // Unknown player
             throw new AreaShopCommandException("transfer-noPlayer", targetPlayerName);
         }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/regions/BuyRegion.java b/AreaShop/src/main/java/me/wiefferink/areashop/regions/BuyRegion.java
@@ -31,7 +31,7 @@
 public class BuyRegion extends GeneralRegion {
 
 	private final Economy economy;
-	
+
 	@AssistedInject
 	BuyRegion(
 			@Nonnull AreaShop plugin,
@@ -424,7 +424,7 @@ public boolean buy(OfflinePlayer offlinePlayer) {
 
 			// Resell is done, disable that now
 			disableReselling();
-			
+
 			// Send message to the player
 			message(offlinePlayer, "buy-successResale", oldOwnerName);
 			Player seller = Bukkit.getPlayer(oldOwner);
@@ -542,7 +542,7 @@ && getBooleanSetting("buy.sellDisabled")) {
 
 			// Give back the money
 			OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
-			if(player.hasPlayedBefore() && !noPayBack) {
+			if((player.hasPlayedBefore() || player.isOnline()) && !noPayBack) {
 				EconomyResponse response = null;
 				boolean error = false;
 				try {

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java b/AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java
@@ -472,7 +472,7 @@ public UUID getLandlord() {
 		if(landlordName != null && !landlordName.isEmpty()) {
 			@SuppressWarnings("deprecation")
 			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(landlordName);
-			if(offlinePlayer.hasPlayedBefore()) {
+			if(offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline()) {
 				return offlinePlayer.getUniqueId();
 			}
 		}

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/regions/ImportJob.java b/AreaShop/src/main/java/me/wiefferink/areashop/regions/ImportJob.java
@@ -279,7 +279,7 @@ public void execute() {
 				if(owner != null) {
 					@SuppressWarnings("deprecation")
 					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-					if(offlinePlayer.hasPlayedBefore()) {
+					if(offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline()) {
 						existing.add(offlinePlayer.getUniqueId());
 					}
 				}

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/tools/SpigotOfflinePlayerHelper.java b/AreaShop/src/main/java/me/wiefferink/areashop/tools/SpigotOfflinePlayerHelper.java
@@ -21,7 +21,7 @@ public SpigotOfflinePlayerHelper(@NotNull Plugin plugin) {
     @Override
     public CompletableFuture<Optional<UUID>> lookupUuidAsync(String username) {
         return lookupOfflinePlayerAsync(username).thenApply(player -> {
-            if (player.hasPlayedBefore()) {
+            if (player.hasPlayedBefore() || player.isOnline()) {
                 return Optional.of(player.getUniqueId());
             }
             return Optional.empty();
@@ -31,6 +31,11 @@ public CompletableFuture<Optional<UUID>> lookupUuidAsync(String username) {
     @Override
     public CompletableFuture<OfflinePlayer> lookupOfflinePlayerAsync(String username) {
         final CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
+        OfflinePlayer onlinePlayer = this.plugin.getServer().getPlayerExact(username);
+        if (onlinePlayer != null) {
+            future.complete(onlinePlayer);
+            return future;
+        }
         final Server server = this.plugin.getServer();
         server.getScheduler().runTaskAsynchronously(this.plugin, () -> {
             @SuppressWarnings("deprecation")

diff --git a/...rc/main/java/me/wiefferink/areashop/adapters/platform/paper/PaperOfflinePlayerHelper.java b/...rc/main/java/me/wiefferink/areashop/adapters/platform/paper/PaperOfflinePlayerHelper.java
@@ -29,6 +29,11 @@ public CompletableFuture<Optional<UUID>> lookupUuidAsync(String username) {
     @Override
     public CompletableFuture<OfflinePlayer> lookupOfflinePlayerAsync(String username) {
         final CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
+        OfflinePlayer onlinePlayer = this.server.getPlayerExact(username);
+        if (onlinePlayer != null) {
+            future.complete(onlinePlayer);
+            return future;
+        }
         OfflinePlayer cachedPlayer = this.server.getOfflinePlayerIfCached(username);
         if (cachedPlayer != null) {
             return CompletableFuture.completedFuture(cachedPlayer);

diff --git a/areashop-interface/src/main/java/me/wiefferink/areashop/interfaces/RegionAccessSet.java b/areashop-interface/src/main/java/me/wiefferink/areashop/interfaces/RegionAccessSet.java
@@ -56,7 +56,7 @@ public List<UUID> asUniqueIdList() {
 		for(String playerName : playerNames) {
 			@SuppressWarnings("deprecation")
 			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerName);
-			if(offlinePlayer.hasPlayedBefore()) {
+			if(offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline()) {
 				result.add(offlinePlayer.getUniqueId());
 			}
 		}