Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-10 21:02:36 +01:00
Code Issues Projects Releases Wiki Activity

Null check for bad economy plugins

Browse Source
This commit is contained in:
fullwall 2024-09-05 23:40:10 +08:00
parent 8a53ac68f8
commit 7cabe94b14
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,12 +55,14 @@ public class MoneyAction extends NPCShopAction {
return Transaction.create(() -> true, () -> {
EconomyResponse response = economy.depositPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
if (response != null
&& (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED)) {
Messaging.severe("Failed to deposit", amount, "to", player, "in NPC shop:", response.errorMessage);
}
}, () -> {
EconomyResponse response = economy.withdrawPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
if (response != null
&& (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED)) {
Messaging.severe("Failed to withdraw", amount, "from", player, "in NPC shop:", response.errorMessage);
}
});
@ -77,12 +79,14 @@ public class MoneyAction extends NPCShopAction {
return Transaction.create(() -> economy.has(player, amount), () -> {
EconomyResponse response = economy.withdrawPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
if (response != null
&& (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED)) {
Messaging.severe("Failed to withdraw", amount, "from", player, "in NPC shop:", response.errorMessage);
}
}, () -> {
EconomyResponse response = economy.depositPlayer(player, amount);
if (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED) {
if (response != null
&& (response.type == ResponseType.FAILURE || response.type == ResponseType.NOT_IMPLEMENTED)) {
Messaging.severe("Failed to deposit", amount, "to", player, "in NPC shop:", response.errorMessage);
}
});