2 files changed, 12 insertions, 3 deletions

diff --git a/CONTEXT.md b/CONTEXT.md
index d1dbf26..92094bc 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -619,6 +619,12 @@ vocabulary / decisions.
   `CBaseCombatCharacter::m_iAmmo` array) is compared with the `sk_max_*` cvar
   (stock caps as fallback, e.g. RPG rockets = 3). Full ammo hides the pickup;
   if either value cannot be read the item stays visible.
+- The datamap offset for `m_iAmmo`/`m_hMyWeapons` points at the
+  `CNetworkArray` length header; the actual elements start **4 bytes later**.
+  Reading at the raw offset shifted every count by one type (e.g. RPG read the
+  buckshot count 30 against a max of 3, permanently hiding rockets).
+- Chargers and ammo/supply crates are dispensers and are exempt from the
+  fullness filter.
 - Scans the client entity list every 100 ms and tags health, ammo, armor/suit,
   world weapon pickups, the two supply-crate models and generic items.
 - Each tag is a colored marker with a name and optional distance, filtered by
diff --git a/src/server.cpp b/src/server.cpp
index af0a8ff..09d198a 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -482,7 +482,9 @@ float server_grenade_radius(int idx) {
   return *(float *)((uintptr_t)base + g_srv_grenade_radius);
 }
 
-// Server-side CBaseCombatCharacter::m_iAmmo array (reserve ammo).
+// 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).
 int server_player_ammo(int idx, int type) {
   if (!g_srv_ready || g_srv_ammo < 0 || type < 0 || type >= 32)
     return -1;
@@ -490,10 +492,11 @@ int server_player_ammo(int idx, int type) {
   server_entity_health(idx, nullptr, nullptr, &base);
   if (!base)
     return -1;
-  return *(int *)((uintptr_t)base + g_srv_ammo + type * 4);
+  return *(int *)((uintptr_t)base + g_srv_ammo + 4 + type * 4);
 }
 
 // Server-side m_hMyWeapons[48] handle for one inventory slot (0 if empty).
+// Same 4-byte CNetworkArray header as m_iAmmo.
 uint32_t server_player_weapon(int idx, int slot) {
   if (!g_srv_ready || g_srv_myweapons < 0 || slot < 0 || slot >= 48)
     return 0;
@@ -501,7 +504,7 @@ uint32_t server_player_weapon(int idx, int slot) {
   server_entity_health(idx, nullptr, nullptr, &base);
   if (!base)
     return 0;
-  return *(uint32_t *)((uintptr_t)base + g_srv_myweapons + slot * 4);
+  return *(uint32_t *)((uintptr_t)base + g_srv_myweapons + 4 + slot * 4);
 }
 
 // Entity index of the player's active weapon from the authoritative server