Compare commits
2 Commits
0464cf61d3
...
4737ad1cfa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4737ad1cfa | ||
|
|
f714cbef24 |
9
Jenkinsfile
vendored
9
Jenkinsfile
vendored
|
|
@ -16,5 +16,14 @@ pipeline {
|
||||||
discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
|
discordSend description: "Build: ${BUILD_NUMBER}", showChangeset: true, result: currentBuild.currentResult, title: currentBuild.fullProjectName, webhookURL: env.discordwebhook
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
stage('Copy to /mnt/updates/plugins') {
|
||||||
|
when {
|
||||||
|
branch 'main'
|
||||||
|
branch 'master'
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
sh 'cp build/libs/*.jar /mnt/updates/plugins/'
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -65,7 +65,7 @@ public class PlayerShop {
|
||||||
playerShop.server = server;
|
playerShop.server = server;
|
||||||
playerShop.price = price;
|
playerShop.price = price;
|
||||||
playerShop.amount = amount;
|
playerShop.amount = amount;
|
||||||
playerShop.balance = balance;
|
playerShop.balance = EconomyUtils.round(balance);
|
||||||
playerShop.itemStack = item;
|
playerShop.itemStack = item;
|
||||||
playerShop.lastTransaction = lastTransaction;
|
playerShop.lastTransaction = lastTransaction;
|
||||||
|
|
||||||
|
|
@ -193,7 +193,7 @@ public class PlayerShop {
|
||||||
}
|
}
|
||||||
|
|
||||||
public double getPricePerItem() {
|
public double getPricePerItem() {
|
||||||
return this.getPrice() / this.getAmount();
|
return EconomyUtils.round(this.getPrice() / this.getAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean removeBalance(double amount) {
|
public boolean removeBalance(double amount) {
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,9 @@ import com.alttd.playershops.shop.PlayerShop;
|
||||||
import net.milkbowl.vault.economy.EconomyResponse;
|
import net.milkbowl.vault.economy.EconomyResponse;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
|
|
||||||
// TODO document
|
// TODO document
|
||||||
public class EconomyUtils {
|
public class EconomyUtils {
|
||||||
|
|
||||||
|
|
@ -55,4 +58,11 @@ public class EconomyUtils {
|
||||||
// if we ever need to limit the maximum balance a shop can have this is the place
|
// if we ever need to limit the maximum balance a shop can have this is the place
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static double round(double value) {
|
||||||
|
BigDecimal bd = BigDecimal.valueOf(value);
|
||||||
|
bd = bd.setScale(2, RoundingMode.HALF_UP);
|
||||||
|
return bd.doubleValue();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user