Merge remote-tracking branch 'origin/master'

PlayerNguyen · May 4, 2021 · 0f522e3 · 0f522e3
2 parents 25a3567 + ed7ada8
commit 0f522e3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandAdd.java b/src/main/java/me/playernguyen/opteco/command/SubCommandAdd.java
@@ -51,8 +51,8 @@ private boolean execute(CommandSender sender, ArrayList<String> args) {
         String _target = args.get(0);
         OfflinePlayer target = Bukkit.getOfflinePlayer(_target);
         String _value = args.get(1);
-        // If this offline player has never played before
-        if (!target.hasPlayedBefore()) {
+        // If this offline player has never played before and is not online
+        if (!target.hasPlayedBefore() && !target.isOnline()) {
             sender.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))

diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandCheck.java b/src/main/java/me/playernguyen/opteco/command/SubCommandCheck.java
@@ -61,8 +61,8 @@ private boolean exec(CommandSender sender, ArrayList<String> args) {
         }
         String _target = args.get(0);
         OfflinePlayer target = Bukkit.getOfflinePlayer(_target);
-        // If this offline player has never played before
-        if (!target.hasPlayedBefore()) {
+        // If this offline player has never played before and is not online
+        if (!target.hasPlayedBefore() && !target.isOnline()) {
             sender.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))

diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandPay.java b/src/main/java/me/playernguyen/opteco/command/SubCommandPay.java
@@ -48,8 +48,8 @@ public boolean onPlayerCommand(Player player, ArrayList<String> args) {
         String _target = args.get(0);
         OfflinePlayer target = Bukkit.getOfflinePlayer(_target);
         String _value = args.get(1);
-        // If player has no account
-        if (!target.hasPlayedBefore()) {
+        // If this offline player has never played before and is not online
+        if (!target.hasPlayedBefore() && !target.isOnline()) {
             player.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))

diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandSet.java b/src/main/java/me/playernguyen/opteco/command/SubCommandSet.java
@@ -50,8 +50,8 @@ private boolean execute(CommandSender sender, ArrayList<String> args) {
         String _target = args.get(0);
         OfflinePlayer target = Bukkit.getOfflinePlayer(_target);
         String _value = args.get(1);
-        // If this offline player has never played before
-        if (!target.hasPlayedBefore()) {
+        // If this offline player has never played before and is not online
+        if (!target.hasPlayedBefore() && !target.isOnline()) {
             sender.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))

diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandTake.java b/src/main/java/me/playernguyen/opteco/command/SubCommandTake.java
@@ -52,8 +52,8 @@ private boolean execute(CommandSender sender, ArrayList<String> args) {
         String _target = args.get(0);
         OfflinePlayer target = Bukkit.getOfflinePlayer(_target);
         String _value = args.get(1);
-        // If this offline player has never played before
-        if (!target.hasPlayedBefore()) {
+        // If this offline player has never played before and is not online
+        if (!target.hasPlayedBefore() && !target.isOnline()) {
             sender.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))