diff --git a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java index 3d7f3ba..0ebe50d 100644 --- a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java +++ b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.java @@ -148,7 +148,7 @@ public class MscroleAdminCommand implements CommandExecutor { return; } - plugin.getCurrencyManager().addBalance(target, amount); + plugin.getCurrencyManager().addBalance(target, amount, sender.getName()); sender.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("currency-given").replace("{amount}", String.valueOf(amount)).replace("{receiver}", target.getName())); target.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("currency-received-from-admin").replace("{amount}", String.valueOf(amount))); } @@ -173,7 +173,7 @@ public class MscroleAdminCommand implements CommandExecutor { return; } - plugin.getCurrencyManager().subtractBalance(target, amount); + plugin.getCurrencyManager().subtractBalance(target, amount, sender.getName()); sender.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("currency-taken").replace("{amount}", String.valueOf(amount)).replace("{player}", target.getName())); target.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("currency-taken-by-admin").replace("{amount}", String.valueOf(amount))); } @@ -198,7 +198,7 @@ public class MscroleAdminCommand implements CommandExecutor { return; } - plugin.getCurrencyManager().setBalance(target, amount); + plugin.getCurrencyManager().setBalance(target, amount, sender.getName()); sender.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("balance-set").replace("{player}", target.getName()).replace("{amount}", String.valueOf(amount))); } diff --git a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java index 061ae7c..b08adfa 100644 --- a/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java +++ b/src/main/java/com/github/krzysiek944/mscrole/commands/MscroleCommand.java @@ -118,8 +118,8 @@ public class MscroleCommand implements CommandExecutor { return; } - plugin.getCurrencyManager().subtractBalance(player, amount); - plugin.getCurrencyManager().addBalance(target, amount); + plugin.getCurrencyManager().subtractBalance(player, amount, player.getName()); + plugin.getCurrencyManager().addBalance(target, amount, player.getName()); player.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("currency-sent").replace("{amount}", String.valueOf(amount)).replace("{receiver}", target.getName())); target.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("currency-received").replace("{amount}", String.valueOf(amount)).replace("{sender}", player.getName())); diff --git a/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java b/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java index c1dd76b..27b7f3d 100644 --- a/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java +++ b/src/main/java/com/github/krzysiek944/mscrole/listeners/GuiListener.java @@ -38,7 +38,7 @@ public class GuiListener implements Listener { if (price > 0) { int balance = plugin.getCurrencyManager().getBalance(player); if (balance >= price) { - plugin.getCurrencyManager().subtractBalance(player, price); + plugin.getCurrencyManager().subtractBalance(player, price, "CONSOLE"); for (String command : commands) { plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), command.replace("%player%", player.getName())); } diff --git a/src/main/java/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.java b/src/main/java/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.java index 76ad650..916354f 100644 --- a/src/main/java/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.java +++ b/src/main/java/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.java @@ -19,7 +19,7 @@ public class PlayerJoinListener implements Listener { Player player = event.getPlayer(); if (!player.hasPlayedBefore()) { int startingBalance = plugin.getConfig().getInt("starting-balance", 1000); - plugin.getCurrencyManager().setBalance(player, startingBalance); + plugin.getCurrencyManager().setBalance(player, startingBalance, "CONSOLE"); player.sendMessage(plugin.getPrefix() + plugin.getMessageManager().getMessage("player-join").replace("{player}", player.getName()).replace("{amount}", String.valueOf(startingBalance))); } } diff --git a/src/main/java/com/github/krzysiek944/mscrole/services/CurrencyManager.java b/src/main/java/com/github/krzysiek944/mscrole/services/CurrencyManager.java index ece8dcd..72ecef7 100644 --- a/src/main/java/com/github/krzysiek944/mscrole/services/CurrencyManager.java +++ b/src/main/java/com/github/krzysiek944/mscrole/services/CurrencyManager.java @@ -23,31 +23,31 @@ public class CurrencyManager { return dataManager.getConfig().getInt("balances." + uuid.toString(), 0); } - public void setBalance(Player player, int amount) { - setBalance(player.getUniqueId(), amount); + public void setBalance(Player player, int amount, String actor) { + setBalance(player.getUniqueId(), amount, actor); } - public void setBalance(UUID uuid, int amount) { + public void setBalance(UUID uuid, int amount, String actor) { dataManager.getConfig().set("balances." + uuid.toString(), amount); dataManager.saveConfig(); - plugin.logToFile("[Currency] Set balance of " + uuid.toString() + " to " + amount); + plugin.logToFile("[Currency] Actor: " + actor + " set balance of " + uuid.toString() + " to " + amount); } - public void addBalance(Player player, int amount) { - addBalance(player.getUniqueId(), amount); + public void addBalance(Player player, int amount, String actor) { + addBalance(player.getUniqueId(), amount, actor); } - public void addBalance(UUID uuid, int amount) { - setBalance(uuid, getBalance(uuid) + amount); - plugin.logToFile("[Currency] Added " + amount + " to " + uuid.toString()); + public void addBalance(UUID uuid, int amount, String actor) { + setBalance(uuid, getBalance(uuid) + amount, actor); + plugin.logToFile("[Currency] Actor: " + actor + " added " + amount + " to " + uuid.toString()); } - public void subtractBalance(Player player, int amount) { - subtractBalance(player.getUniqueId(), amount); + public void subtractBalance(Player player, int amount, String actor) { + subtractBalance(player.getUniqueId(), amount, actor); } - public void subtractBalance(UUID uuid, int amount) { - setBalance(uuid, getBalance(uuid) - amount); - plugin.logToFile("[Currency] Subtracted " + amount + " from " + uuid.toString()); + public void subtractBalance(UUID uuid, int amount, String actor) { + setBalance(uuid, getBalance(uuid) - amount, actor); + plugin.logToFile("[Currency] Actor: " + actor + " subtracted " + amount + " from " + uuid.toString()); } } diff --git a/target/MSCROLE-1.2.jar b/target/MSCROLE-1.2.jar index fad6bc3..ef8152b 100644 Binary files a/target/MSCROLE-1.2.jar and b/target/MSCROLE-1.2.jar differ diff --git a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class index a6c2b52..a00a13a 100644 Binary files a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class and b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleAdminCommand.class differ diff --git a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class index f64fda8..fb8ae2f 100644 Binary files a/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class and b/target/classes/com/github/krzysiek944/mscrole/commands/MscroleCommand.class differ diff --git a/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class b/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class index 2f839ad..9687963 100644 Binary files a/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class and b/target/classes/com/github/krzysiek944/mscrole/listeners/GuiListener.class differ diff --git a/target/classes/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.class b/target/classes/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.class index 30319aa..c645da1 100644 Binary files a/target/classes/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.class and b/target/classes/com/github/krzysiek944/mscrole/listeners/PlayerJoinListener.class differ diff --git a/target/classes/com/github/krzysiek944/mscrole/services/CurrencyManager.class b/target/classes/com/github/krzysiek944/mscrole/services/CurrencyManager.class index c228a20..2c96b1e 100644 Binary files a/target/classes/com/github/krzysiek944/mscrole/services/CurrencyManager.class and b/target/classes/com/github/krzysiek944/mscrole/services/CurrencyManager.class differ diff --git a/target/original-MSCROLE-1.2.jar b/target/original-MSCROLE-1.2.jar index 1b45970..d7ac010 100644 Binary files a/target/original-MSCROLE-1.2.jar and b/target/original-MSCROLE-1.2.jar differ