Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-21 03:51:29 +02:00
Code Issues Projects Releases Wiki Activity

Log some errors in MoneyAction if they occur

Browse Source
This commit is contained in:
fullwall 2024-09-05 23:38:52 +08:00
parent 4b00b48c21
commit 8a53ac68f8
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
main/src/main/java/net/citizensnpcs/trait/shop/MoneyAction.java
View File

@ -15,6 +15,8 @@ import net.citizensnpcs.api.util.Messaging;
import net.citizensnpcs.util.InventoryMultiplexer;
import net.citizensnpcs.util.Util;
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse;
import net.milkbowl.vault.economy.EconomyResponse.ResponseType;
public class MoneyAction extends NPCShopAction {
@Persist
@ -52,9 +54,15 @@ public class MoneyAction extends NPCShopAction {
double amount = money * repeats;
return Transaction.create(() -> true, () -> {
economy.depositPlayer(player, amount);
EconomyResponse response = economy.depositPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
Messaging.severe("Failed to deposit", amount, "to", player, "in NPC shop:", response.errorMessage);
}
}, () -> {
economy.withdrawPlayer(player, amount);
EconomyResponse response = economy.withdrawPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
Messaging.severe("Failed to withdraw", amount, "from", player, "in NPC shop:", response.errorMessage);
}
});
}
@ -68,15 +76,29 @@ public class MoneyAction extends NPCShopAction {
double amount = money * repeats;
return Transaction.create(() -> economy.has(player, amount), () -> {
economy.withdrawPlayer(player, amount);
EconomyResponse response = economy.withdrawPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
Messaging.severe("Failed to withdraw", amount, "from", player, "in NPC shop:", response.errorMessage);
}
}, () -> {
economy.depositPlayer(player, amount);
EconomyResponse response = economy.depositPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
Messaging.severe("Failed to deposit", amount, "to", player, "in NPC shop:", response.errorMessage);
}
});
}
public static class MoneyActionGUI implements GUI {
private Boolean supported;
public MoneyActionGUI() {
try {
Class.forName("net.milkbowl.vault.economy.Economy");
} catch (ClassNotFoundException e) {
supported = false;
}
}
@Override
public InventoryMenuPage createEditor(NPCShopAction previous, Consumer<NPCShopAction> callback) {
MoneyAction action = previous == null ? new MoneyAction() : (MoneyAction) previous;
@ -102,6 +124,8 @@ public class MoneyAction extends NPCShopAction {
supported = Bukkit.getServicesManager().getRegistration(Economy.class).getProvider() != null;
} catch (Throwable t) {
supported = false;
Messaging.severe("Error fetching shop economy provider, shop economy integration will not work:");
t.printStackTrace();
}
}
if (!supported)

5
main/src/main/java/net/citizensnpcs/trait/shop/NPCShopAction.java
View File

@ -111,6 +111,7 @@ public abstract class NPCShopAction implements Cloneable {
GUI.add(gui);
}
private static List<GUI> GUI = Lists.newArrayList();
private static PersisterRegistry<NPCShopAction> REGISTRY = PersistenceLoader.createRegistry(NPCShopAction.class);
private static final List<GUI> GUI = Lists.newArrayList();
private static final PersisterRegistry<NPCShopAction> REGISTRY = PersistenceLoader
.createRegistry(NPCShopAction.class);
}