Skip to content

Commit 3d15694

Browse files
committed
Fix EconomyTransaction NPE
1 parent c76feaa commit 3d15694

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/main/java/org/maxgamer/quickshop/api/economy/EconomyTransaction.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class EconomyTransaction {
4848
private final EconomyCore core;
4949
private final double actualAmount;
5050
private final double tax;
51+
@Nullable
5152
private final Trader taxer;
5253
private final boolean allowLoan;
5354
private final boolean tryingFixBalanceInsufficient;
@@ -266,7 +267,7 @@ default boolean onCommit(@NotNull EconomyTransaction economyTransaction) {
266267
*/
267268
default void onSuccess(@NotNull EconomyTransaction economyTransaction) {
268269
Util.debugLog("Transaction succeed.");
269-
QuickShop.getInstance().logEvent(new EconomyTransactionLog(true, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
270+
QuickShop.getInstance().logEvent(new EconomyTransactionLog(true, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer() == null ? Util.getNilUniqueId() : economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
270271
}
271272

272273
/**
@@ -278,7 +279,7 @@ default void onSuccess(@NotNull EconomyTransaction economyTransaction) {
278279
*/
279280
default void onFailed(@NotNull EconomyTransaction economyTransaction) {
280281
Util.debugLog("Transaction failed: " + economyTransaction.getLastError() + ".");
281-
QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
282+
QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer() == null ? Util.getNilUniqueId() : economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
282283
}
283284

284285
/**
@@ -290,7 +291,7 @@ default void onFailed(@NotNull EconomyTransaction economyTransaction) {
290291
*/
291292
default void onTaxFailed(@NotNull EconomyTransaction economyTransaction) {
292293
Util.debugLog("Tax Transaction failed: " + economyTransaction.getLastError() + ".");
293-
QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
294+
QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer() == null ? Util.getNilUniqueId() : economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
294295
}
295296

296297
}

0 commit comments

Comments
 (0)