2 Commits 062af591d4 ... a7e51d7b59

Author SHA1 Message Date
  mastercake10 a7e51d7b59 increment minor version 8 months ago
  mastercake10 58b0d5cbd3 don't send a message when payout amount is 0 8 months ago
4 changed files with 9 additions and 9 deletions
  1. 2 2
      Plugin/pom.xml
  2. 5 5
      Plugin/src/main/java/de/Linus122/TimeIsMoney/Main.java
  3. 1 1
      Tools/pom.xml
  4. 1 1
      pom.xml

+ 2 - 2
Plugin/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>de.Linus122.TimeIsMoney</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.9.9</version>
+		<version>1.9.10</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -111,7 +111,7 @@
 		<dependency>
 			<groupId>de.Linus122.TimeIsMoney</groupId>
 			<artifactId>Tools</artifactId>
-			<version>1.9.9</version>
+			<version>1.9.10</version>
 		</dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>

+ 5 - 5
Plugin/src/main/java/de/Linus122/TimeIsMoney/Main.java

@@ -398,7 +398,7 @@ public class Main extends JavaPlugin {
 				return;
 			}
 		}
-		
+
 		if (finalconfig.getBoolean("store-money-in-bank")) {
 			ATM.depositBank(player, payout_amt);
 		} else {
@@ -412,20 +412,20 @@ public class Main extends JavaPlugin {
 		}
 		
 		if (!afk) {
-			if (finalconfig.getBoolean("display-messages-in-chat")) {
+			if (finalconfig.getBoolean("display-messages-in-chat") && payout_amt > 0d) {
 				sendMessage(player, CC(finalconfig.getString("message")).replace("%money%", economy.format(payout_amt)));
 			}
-			if (finalconfig.getBoolean("display-messages-in-actionbar")) {
+			if (finalconfig.getBoolean("display-messages-in-actionbar") && payout_amt > 0d) {
 				sendActionbar(player, CC(finalconfig.getString("message_actionbar")).replace("%money%", economy.format(payout_amt)));
 			}
 			for (String cmd : payout.commands) {
 				dispatchCommandSync(applyPlaceholders(player, cmd.replace("/", "").replaceAll("%player%", player.getName())));
 			}
 		} else {
-			if (finalconfig.getBoolean("display-messages-in-chat") && finalconfig.isSet("message_afk_payout")) {
+			if (finalconfig.getBoolean("display-messages-in-chat") && finalconfig.isSet("message_afk_payout") && payout_amt > 0d) {
 				sendMessage(player, CC(finalconfig.getString("message_afk_payout").replace("%money%", economy.format(payout_amt)).replace("%percent%", "" + afkPercent)));
 			}
-			if (finalconfig.getBoolean("display-messages-in-actionbar") && finalconfig.isSet("message_afk_actionbar_payout")) {
+			if (finalconfig.getBoolean("display-messages-in-actionbar") && finalconfig.isSet("message_afk_actionbar_payout") && payout_amt > 0d) {
 				sendActionbar(player, CC(finalconfig.getString("message_afk_actionbar_payout").replace("%money%", economy.format(payout_amt)).replace("%percent%", "" + afkPercent)));
 			}
 			for (String cmd : payout.commands_if_afk) {

+ 1 - 1
Tools/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>de.Linus122.TimeIsMoney</groupId>
         <artifactId>parent</artifactId>
-        <version>1.9.9</version>
+        <version>1.9.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

+ 1 - 1
pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.Linus122.TimeIsMoney</groupId>
     <artifactId>parent</artifactId>
-    <version>1.9.9</version>
+    <version>1.9.10</version>
     <name>TimeIsMoney</name>
     <url>https://www.spigotmc.org/resources/time-is-money.12409/</url>
     <packaging>pom</packaging>