From 98ec8044cecb02e65b4fc884faa0d510a7537c7d Mon Sep 17 00:00:00 2001
From: cubefury <thetarragondevteam@gmail.com>
Date: Fri, 9 Jan 2026 00:37:51 +0800
Subject: [PATCH] Fix potential NPE crash from bad trade request with invalid
 tradegroup.

---
 .../java/com/cubefury/vendingmachine/trade/TradeManager.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java b/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java
index 568c735..e5368f9 100644
--- a/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java
+++ b/src/main/java/com/cubefury/vendingmachine/trade/TradeManager.java
@@ -183,6 +183,9 @@ public void setTradeState(@Nonnull UUID player, TradeGroup tg, TradeHistory hist
     }
 
     public boolean canExecuteTrade(@Nonnull UUID player, TradeGroup tg) {
+        if (tg == null) {
+            return false;
+        }
         long currentTimestamp = System.currentTimeMillis();
         TradeHistory history = getTradeState(player, tg);
         long lastTradeTime = history.lastTrade;