1 files changed, 11 insertions, 1 deletions

diff --git a/src/esp.cpp b/src/esp.cpp
index 594a8fa..dbe0051 100644
--- a/src/esp.cpp
+++ b/src/esp.cpp
@@ -2655,6 +2655,16 @@ static bool item_kind_enabled(int kind) {
   }
 }
 
+// Health chargers are brushes (func_healthcharger/CWallHealth) and suit
+// chargers are item_suitcharger/CNewRecharge. Both expose m_iJuice.
+static bool item_is_charger(const char *model, const char *cls) {
+  return item_icontains(model, "charger") ||
+         item_icontains(model, "suit_charger") ||
+         item_icontains(cls, "charger") ||
+         item_icontains(cls, "wallhealth") ||
+         item_icontains(cls, "recharge");
+}
+
 static void items_collect(int local_idx) {
   static double last_scan = 0.0;
   double now = esp_now();
@@ -2784,7 +2794,7 @@ static void items_collect(int local_idx) {
     // Health/suit chargers are dispensers that stay useful after a refill, but
     // an empty one cannot give anything. m_iJuice is 0 when depleted (until it
     // recharges); only hide the tag once the server value is readable.
-    if (strcasestr(label, "charger") && server_item_juice(idx) == 0)
+    if (item_is_charger(model, cls) && server_item_juice(idx) == 0)
       continue;
 
     Vector origin{*(float *)((uintptr_t)ent + g_net.origin),