From 49c99568c7dbd8c460bf60451584b36dbb24e040 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Wed, 16 Jul 2025 01:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=BD=E5=85=B7=E8=83=BD?=
 =?UTF-8?q?=E9=87=8F=E6=96=B9=E6=B3=95=E7=9A=84=E8=AD=A6=E5=91=8A=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vehicle/base/VehicleEntity.java    | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java
index a042dae5f..410b2f194 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java
+++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java
@@ -510,25 +510,41 @@ public abstract class VehicleEntity extends Entity implements Container {
      * @param amount 要消耗的电量
      */
     protected void consumeEnergy(int amount) {
-        if (!this.hasEnergyStorage()) return;
+        if (!this.hasEnergyStorage()) {
+            Mod.LOGGER.warn("Trying to consume energy of vehicle {}, but it has no energy storage", this.getName());
+            return;
+        }
         this.energyStorage.extractEnergy(amount, false);
     }
 
     protected boolean canConsume(int amount) {
-        if (!this.hasEnergyStorage()) return false;
+        if (!this.hasEnergyStorage()) {
+            Mod.LOGGER.warn("Trying to check if can consume energy of vehicle {}, but it has no energy storage", this.getName());
+            return false;
+        }
         return this.getEnergy() >= amount;
     }
 
     public int getEnergy() {
+        if (!this.hasEnergyStorage()) {
+            Mod.LOGGER.warn("Trying to get energy of vehicle {}, but it has no energy storage", this.getName());
+            return Integer.MAX_VALUE;
+        }
         return this.energyStorage.getEnergyStored();
     }
 
     public IEnergyStorage getEnergyStorage() {
+        if (!this.hasEnergyStorage()) {
+            Mod.LOGGER.warn("Trying to get energy storage of vehicle {}, but it has no energy storage", this.getName());
+        }
         return this.energyStorage;
     }
 
     protected void setEnergy(int pEnergy) {
-        if (!this.hasEnergyStorage()) return;
+        if (!this.hasEnergyStorage()) {
+            Mod.LOGGER.warn("Trying to set energy of vehicle {}, but it has no energy storage", this.getName());
+            return;
+        }
         int targetEnergy = Mth.clamp(pEnergy, 0, this.getMaxEnergy());
 
         if (targetEnergy > energyStorage.getEnergyStored()) {
@@ -539,6 +555,10 @@ public abstract class VehicleEntity extends Entity implements Container {
     }
 
     public int getMaxEnergy() {
+        if (!this.hasEnergyStorage()) {
+            Mod.LOGGER.warn("Trying to get max energy of vehicle {}, but it has no energy storage", this.getName());
+            return Integer.MAX_VALUE;
+        }
         return data().maxEnergy();
     }