Fix issues with cancelled transactions which would still print the me…

…ssage
ChestShop-authors · Jan 5, 2025 · 481f630 · 481f630
1 parent 66c3bfe
commit 481f630
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/EconomyAdapter.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/EconomyAdapter.java
@@ -42,7 +42,7 @@ public abstract class EconomyAdapter implements Listener {
      * @param event The CurrencyTransferEvent to process
      */
     protected void processTransfer(CurrencyTransferEvent event) {
-        if (event.wasHandled()) {
+        if (event.wasHandled() || event.getTransactionEvent() == null || event.getTransactionEvent().isCancelled()) {
             return;
         }
 

diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionMessageSender.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionMessageSender.java
@@ -24,9 +24,9 @@
  * @author Acrobot
  */
 public class TransactionMessageSender implements Listener {
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.MONITOR)
     public static void onCurrencyTransfer(CurrencyTransferEvent event) {
-        if (event.getTransactionEvent() == null) {
+        if (event.getTransactionEvent() == null || !event.wasHandled() || event.getTransactionEvent().isCancelled()) {
             return;
         }
         if (event.getTransactionEvent().getTransactionType() == TransactionEvent.TransactionType.BUY) {