1 files changed, 16 insertions, 2 deletions

diff --git a/src/server.cpp b/src/server.cpp
index bae355e..6479b25 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -58,6 +58,7 @@ static int g_srv_mapname = -1;
 static int g_srv_armor = -1;
 static int g_srv_detonate = -1;
 static int g_srv_grenade_radius = -1;
+static int g_srv_juice = -1;
 static int g_srv_ammo = -1;
 static int g_srv_myweapons = -1;
 static bool g_srv_ready = false;
@@ -162,6 +163,7 @@ bool resolve_server_netvars() {
   // CBaseGrenade fuse / blast radius (m_flDetonateTime is not networked).
   g_srv_detonate = datamap_offset("m_flDetonateTime", FIELD_TIME);
   g_srv_grenade_radius = datamap_offset("m_DmgRadius", FIELD_FLOAT);
+  g_srv_juice = datamap_offset("m_iJuice", FIELD_INTEGER);
   // CBaseCombatCharacter arrays: ammo counts and the weapon handle list.
   g_srv_ammo = datamap_offset("m_iAmmo", FIELD_INTEGER, 0x40, 0x4000);
   g_srv_myweapons = datamap_offset("m_hMyWeapons", FIELD_EHANDLE);
@@ -171,13 +173,13 @@ bool resolve_server_netvars() {
          "modelindex=%d absvel=%d vel=%d activeweapon=%d relationship=%d "
          "followtarget=%d spawnflags=%d hacked=%d npcstate=%d "
          "takedamage=%d mapname=%d armor=%d detonate=%d dmgradius=%d "
-         "ammo=%d myweapons=%d",
+         "ammo=%d myweapons=%d juice=%d",
          g_server.path.c_str(), g_srv_health, g_srv_maxhealth, g_srv_lifestate,
          g_srv_modelindex, g_srv_absvelocity, g_srv_velocity,
          g_srv_activeweapon, g_srv_relationship, g_srv_followtarget,
          g_srv_spawnflags, g_srv_hacked, g_srv_npcstate, g_srv_takedamage,
          g_srv_mapname, g_srv_armor, g_srv_detonate, g_srv_grenade_radius,
-         g_srv_ammo, g_srv_myweapons);
+         g_srv_ammo, g_srv_myweapons, g_srv_juice);
     fail_logged = false;
   } else if (!fail_logged) {
     fail_logged = true;
@@ -475,6 +477,18 @@ float server_grenade_radius(int idx) {
   return *(float *)((uintptr_t)base + g_srv_grenade_radius);
 }
 
+// CWallHealth / CNewRecharge share the same m_iJuice layout (the fields before
+// it match), so one datamap offset works for both health and suit chargers.
+int server_item_juice(int idx) {
+  if (!g_srv_ready || g_srv_juice < 0)
+    return -1;
+  void *base = nullptr;
+  server_entity_health(idx, nullptr, nullptr, &base);
+  if (!base)
+    return -1;
+  return *(int *)((uintptr_t)base + g_srv_juice);
+}
+
 // Server-side CBaseCombatCharacter::m_iAmmo array (reserve ammo). The datamap
 // offset points at the CNetworkArray length header; the elements start 4 bytes
 // later (confirmed by the shifted current/max table).