Merge pull request #33 from dhiepp/master

PlayerNguyen · Nov 23, 2021 · 2fd934f · 2fd934f
2 parents 73ab88f + 0b1bea5
commit 2fd934f
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 23 deletions.
diff --git a/build.gradle b/build.gradle
@@ -62,13 +62,16 @@ dependencies {
 
 }
 
-//publishing {
-//    publications {
-//        maven(MavenPublication) {
-//            from(components.java)
-//        }
-//    }
-//}
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
+    repositories {
+        mavenLocal()
+    }
+}
 
 processResources {
     from(sourceSets.main.resources.srcDirs) {

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 and is not online
-        if (!target.hasPlayedBefore() && !target.isOnline()) {
+        // If this offline player is not online and does not have an account
+        if (!target.isOnline() && !getPlugin().getAccountDatabase().hasAccount(target.getUniqueId())) {
             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 and is not online
-        if (!target.hasPlayedBefore() && !target.isOnline()) {
+        // If this offline player is not online and does not have an account
+        if (!target.isOnline() && !getPlugin().getAccountDatabase().hasAccount(target.getUniqueId())) {
             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 this offline player has never played before and is not online
-        if (!target.hasPlayedBefore() && !target.isOnline()) {
+        // If this offline player is not online
+        if (!target.isOnline()) {
             player.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))

diff --git a/src/main/java/me/playernguyen/opteco/command/SubCommandPayConfirm.java b/src/main/java/me/playernguyen/opteco/command/SubCommandPayConfirm.java
@@ -41,9 +41,11 @@ public boolean onPlayerCommand(Player player, ArrayList<String> args) {
             Player tranSender = Bukkit.getPlayer(transaction.getPlayer());
             Player tranReceiver = Bukkit.getPlayer(transaction.getTarget());
             if (tranSender != null) {
+                String receiverName = "";
+                if (tranReceiver != null) receiverName = tranReceiver.getName();
                 tranSender.sendMessage(
                         getMessageFormat().format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.PAY_SUCCESS))
-                                .replace("%who%", tranSender.getName())
+                                .replace("%who%", receiverName)
                                 .replace("%value%", getMessageFormat().numberFormat(transaction.getAmount()))
                                 .replace("%currency%", getPlugin().getConfigurationLoader()
                                         .getString(OptEcoConfiguration.CURRENCY_SYMBOL)
@@ -53,9 +55,11 @@ public boolean onPlayerCommand(Player player, ArrayList<String> args) {
                 this.getAccountManager().refresh(tranSender.getUniqueId());
             }
             if (tranReceiver != null) {
+                String senderName = "";
+                if (tranSender != null) senderName = tranSender.getName();
                 tranReceiver.sendMessage(
                         getMessageFormat().format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.PAY_SUCCESS_TARGET))
-                                .replace("%who%", tranReceiver.getName())
+                                .replace("%who%", senderName)
                                 .replace("%value%", getMessageFormat().numberFormat(transaction.getAmount()))
                                 .replace("%currency%", getPlugin().getConfigurationLoader()
                                         .getString(OptEcoConfiguration.CURRENCY_SYMBOL)

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 and is not online
-        if (!target.hasPlayedBefore() && !target.isOnline()) {
+        // If this offline player is not online and does not have an account
+        if (!target.isOnline() && !getPlugin().getAccountDatabase().hasAccount(target.getUniqueId())) {
             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 and is not online
-        if (!target.hasPlayedBefore() && !target.isOnline()) {
+        // If this offline player is not online and does not have an account
+        if (!target.isOnline() && !getPlugin().getAccountDatabase().hasAccount(target.getUniqueId())) {
             sender.sendMessage(
                     getMessageFormat()
                             .format(getPlugin().getLanguageLoader().getLanguage(OptEcoLanguage.VAR_PLAYER_NOT_FOUND))
@@ -77,11 +77,21 @@ private boolean execute(CommandSender sender, ArrayList<String> args) {
             );
             return true;
         }
-        // If sender don't have enough points
-//        if ((getPlugin().getAccountDatabase().getBalance(target.getUniqueId()) - Double.parseDouble(_value)) <
-        OptEcoCacheAccount optEcoCacheAccount = getAccountManager().get(target.getUniqueId());
-        double balance = optEcoCacheAccount.getBalance();
 
+        double balance;
+        // Player is online
+        if (target.isOnline()) {
+            OptEcoCacheAccount optEcoCacheAccount = getAccountManager().get(target.getUniqueId());
+            if (optEcoCacheAccount == null)
+                throw new NullPointerException("Cache player not found: " + target.getUniqueId());
+            balance = optEcoCacheAccount.getBalance();
+        }
+        //Player is not online
+        else {
+            balance = getPlugin().getAccountDatabase().getBalance(target.getUniqueId());
+        }
+
+        // If player doesn't have enough points
         if ((balance - Double.parseDouble(_value)) <
                 getPlugin().getConfigurationLoader().getDouble(OptEcoConfiguration.MIN_BALANCE)) {
             sender.sendMessage(