From 6570950d98ab98204f1934b2e0f335071b8746bf Mon Sep 17 00:00:00 2001 From: Lucas Cosolo <502badgamer@gmail.com> Date: Wed, 26 Dec 2018 23:45:52 -0600 Subject: [PATCH] Fix extras maximums loading late and fix tokenmanager --- .../com/trophonix/tradeplus/extras/Extra.java | 6 +++++- .../tradeplus/extras/TokenManagerExtra.java | 18 +++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/trophonix/tradeplus/extras/Extra.java b/src/main/java/com/trophonix/tradeplus/extras/Extra.java index f2d3cee..655b596 100644 --- a/src/main/java/com/trophonix/tradeplus/extras/Extra.java +++ b/src/main/java/com/trophonix/tradeplus/extras/Extra.java @@ -17,6 +17,7 @@ public abstract class Extra { final ItemStack theirIcon; final double taxPercent; public double value1 = 0, value2 = 0; + double min; double max1; double max2; long lastUpdatedMax = System.currentTimeMillis(); @@ -27,7 +28,10 @@ public abstract class Extra { ConfigurationSection section = pl.getConfig().getConfigurationSection("extras." + name); this.player1 = player1; this.player2 = player2; - this.increment = section.getDouble("increment"); + this.increment = section.getDouble("increment", 1D); + this.min = section.getDouble("minimum", 1D); + this.max1 = getMax(player1); + this.max2 = getMax(player2); this.increment1 = increment; this.increment2 = increment; ItemFactory factory = new ItemFactory(section.getString("material", "PAPER"), Material.PAPER) diff --git a/src/main/java/com/trophonix/tradeplus/extras/TokenManagerExtra.java b/src/main/java/com/trophonix/tradeplus/extras/TokenManagerExtra.java index a7ac37d..3fd5e9f 100644 --- a/src/main/java/com/trophonix/tradeplus/extras/TokenManagerExtra.java +++ b/src/main/java/com/trophonix/tradeplus/extras/TokenManagerExtra.java @@ -2,34 +2,30 @@ import com.trophonix.tradeplus.TradePlus; import com.trophonix.tradeplus.util.ItemFactory; -import me.realized.tokenmanager.api.TokenManager; -import org.bukkit.Bukkit; +import me.realized.tokenmanager.TokenManagerPlugin; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; public class TokenManagerExtra extends Extra { - - private TokenManager tokenManager; - + public TokenManagerExtra(Player player1, Player player2, TradePlus pl) { super("tokenmanager", player1, player2, pl); - tokenManager = (TokenManager) Bukkit.getPluginManager().getPlugin("TokenManager"); } @Override public double getMax(Player player) { - return tokenManager.getTokens(player).orElse(0); + return TokenManagerPlugin.getInstance().getTokens(player).orElse(0); } @Override public void onTradeEnd() { if (value1 > 0) { - tokenManager.removeTokens(player1.getUniqueId().toString(), (long)value1); - tokenManager.addTokens(player2.getUniqueId().toString(), (long)value1); + TokenManagerPlugin.getInstance().removeTokens(player1.getUniqueId().toString(), (long)value1); + TokenManagerPlugin.getInstance().addTokens(player2.getUniqueId().toString(), (long)value1); } if (value2 > 0) { - tokenManager.removeTokens(player2.getUniqueId().toString(), (long)value2); - tokenManager.addTokens(player1.getUniqueId().toString(), (long)value1); + TokenManagerPlugin.getInstance().removeTokens(player2.getUniqueId().toString(), (long)value2); + TokenManagerPlugin.getInstance().addTokens(player1.getUniqueId().toString(), (long)value1); } }