amalthea-mc/ShopChest
1
0
Fork 0
mirror of https://github.com/amalthea-mc/ShopChest.git synced 2024-11-10 04:31:06 +00:00
Code Issues Projects Releases Wiki Activity

Add support for per-world-economy plugins

Browse Source 
The money will be withdrawn or deposited on the world of the shop
This commit is contained in:
Eric 2016-11-23 16:11:07 +01:00
parent d097a15122
commit 103662c532
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java
View File

@ -445,7 +445,7 @@ public class ShopInteractListener implements Listener {
plugin.debug("Create event cancelled (#" + id + ")"); plugin.debug("Create event cancelled (#" + id + ")");
return; return;
} }
EconomyResponse r = plugin.getEconomy().withdrawPlayer(executor, creationPrice); EconomyResponse r = plugin.getEconomy().withdrawPlayer(executor, location.getWorld().getName(), creationPrice);
if (!r.transactionSuccess()) { if (!r.transactionSuccess()) {
plugin.debug("Economy transaction failed: " + r.errorMessage); plugin.debug("Economy transaction failed: " + r.errorMessage);
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage))); executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage)));
@ -645,10 +645,12 @@ public class ShopInteractListener implements Listener {
ItemStack newProduct = new ItemStack(product); ItemStack newProduct = new ItemStack(product);
newProduct.setAmount(newAmount); newProduct.setAmount(newAmount);
EconomyResponse r = econ.withdrawPlayer(executor, newPrice); String worldName = shop.getLocation().getWorld().getName();
EconomyResponse r = econ.withdrawPlayer(executor, worldName, newPrice);
if (r.transactionSuccess()) { if (r.transactionSuccess()) {
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), newPrice) : null; EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), worldName, newPrice) : null;
if (r2 != null) { if (r2 != null) {
if (r2.transactionSuccess()) { if (r2.transactionSuccess()) {
@ -776,10 +778,12 @@ public class ShopInteractListener implements Listener {
ItemStack newProduct = new ItemStack(product); ItemStack newProduct = new ItemStack(product);
newProduct.setAmount(newAmount); newProduct.setAmount(newAmount);
EconomyResponse r = econ.depositPlayer(executor, newPrice); String worldName = shop.getLocation().getWorld().getName();
EconomyResponse r = econ.depositPlayer(executor, worldName, newPrice);
if (r.transactionSuccess()) { if (r.transactionSuccess()) {
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.withdrawPlayer(shop.getVendor(), newPrice) : null; EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.withdrawPlayer(shop.getVendor(), worldName, newPrice) : null;
if (r2 != null) { if (r2 != null) {
if (r2.transactionSuccess()) { if (r2.transactionSuccess()) {