src/CustomCommands.cpp

@@ -359,19 +359,23 @@ static void npcRotateCommand(std::string full, std::vector<std::string>& args, C
     int angle = (plr->angle + 180) % 360;
     NPCManager::updateNPCPosition(npc->id, npc->x, npc->y, npc->z, npc->instanceID, angle);
 
-    bool isGruntworkNpc = true;
+    // if it's a gruntwork NPC, rotate in-place
+    if (TableData::RunningMobs.find(npc->id) != TableData::RunningMobs.end()) {
+        NPCManager::updateNPCPosition(npc->id, npc->x, npc->y, npc->z, npc->instanceID, angle);
 
-    // add a rotation entry to the gruntwork file, unless it's already a gruntwork NPC
+        Chat::sendServerMessage(sock, "[NPCR] Successfully set angle to " + std::to_string(angle) + " for gruntwork NPC "
-    if (TableData::RunningMobs.find(npc->id) == TableData::RunningMobs.end()) {
+            + std::to_string(npc->id));
+    } else {
         TableData::RunningNPCRotations[npc->id] = angle;
-        isGruntworkNpc = false;
+
+        Chat::sendServerMessage(sock, "[NPCR] Successfully set angle to " + std::to_string(angle) + " for NPC "
+            + std::to_string(npc->id));
     }
 
-    Chat::sendServerMessage(sock, "[NPCR] Successfully set angle to " + std::to_string(angle) +
+    // update rotation clientside
-        " for " + (isGruntworkNpc ? "gruntwork " : "") + "NPC " + std::to_string(npc->id));
+    INITSTRUCT(sP_FE2CL_NPC_ENTER, pkt);
-
+    pkt.NPCAppearanceData = npc->getAppearanceData();
-    // update rotation clientside by refreshing the player's chunks (same as the /refresh command)
+    sock->sendPacket(pkt, P_FE2CL_NPC_ENTER);
-    PlayerManager::updatePlayerPositionForWarp(sock, plr->x, plr->y, plr->z, plr->instanceID);
 }
 
 static void refreshCommand(std::string full, std::vector<std::string>& args, CNSocket* sock) {