1 files changed, 18 insertions, 1 deletions

diff --git a/src/esp.cpp b/src/esp.cpp
index 06bafaf..a0d84dd 100644
--- a/src/esp.cpp
+++ b/src/esp.cpp
@@ -873,6 +873,8 @@ bool melee_weapon_active(void *local_ent) {
   if (!local_ent)
     return false;
   int local = engine_get_local_player();
+  if (g_iface.engineserver)
+    resolve_server_netvars();
 
   auto check = [&](int idx, const char **cls_out,
                    const char **model_out) -> bool {
@@ -882,6 +884,14 @@ bool melee_weapon_active(void *local_ent) {
     void *net = entity_networkable(idx);
     const char *cls = net ? entity_class_name(net, nullptr) : nullptr;
     const char *model = wep ? entity_model_name(wep) : nullptr;
+    // Client weapon models can be missing/0 after a map change; recover the
+    // server model index so the crowbar is still recognized.
+    if ((!model || !*model) && g_iface.engineserver) {
+      void *sbase = nullptr;
+      server_entity_health(idx, nullptr, nullptr, &sbase);
+      if (sbase)
+        model = model_name_from_index(server_model_index(sbase));
+    }
     *cls_out = cls;
     *model_out = model;
     return (cls && strstr(cls, "Crowbar")) ||
@@ -916,8 +926,15 @@ bool melee_weapon_active(void *local_ent) {
   if (idx != last_idx || crowbar != last_crowbar) {
     last_idx = idx;
     last_crowbar = crowbar;
-    logd("melee: active idx=%d cls=%s model=%s crowbar=%d", idx,
+    logf("melee: active idx=%d cls=%s model=%s crowbar=%d", idx,
          cls ? cls : "?", model ? model : "?", (int)crowbar);
+    if (!crowbar) {
+      static bool warned = false;
+      if (!warned) {
+        warned = true;
+        toastf(TOAST_WARN, "Melee killbot: equip the crowbar");
+      }
+    }
   }
   return crowbar;
 }