diff options
| -rw-r--r-- | sql/base/world_database.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2011_03_11_2_trinity_string.sql | 6 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 9cf17d7b551..b8343ec918c 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -27295,7 +27295,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_ (536, ' Home movement used for player?!?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (537, ' Taxi flight', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (538, ' Unknown movement generator (%u)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(539, 'Player selected NPC\nGUID: %u.\nFaction: %u.\nnpcFlags: %u.\nEntry: %u.\nDisplayID: %u (Native: %u).', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), +(539, 'Player selected NPC\nDB GUID: %u, current GUID: %u.\nFaction: %u.\nnpcFlags: %u.\nEntry: %u.\nDisplayID: %u (Native: %u).', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (540, 'Level: %u.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (541, 'Health (base): %u. (max): %u. (current): %u.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (542, 'Field Flags: %u.\nDynamic Flags: %u.\nFaction Template: %u.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), diff --git a/sql/updates/world/2011_03_11_2_trinity_string.sql b/sql/updates/world/2011_03_11_2_trinity_string.sql new file mode 100644 index 00000000000..925873f5d6f --- /dev/null +++ b/sql/updates/world/2011_03_11_2_trinity_string.sql @@ -0,0 +1,6 @@ +UPDATE `trinity_string` SET `content_default` = 'Player selected NPC +DB GUID: %u, current GUID: %u. +Faction: %u. +npcFlags: %u. +Entry: %u. +DisplayID: %u (Native: %u).' WHERE `entry` = 539; diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 7b99017f187..0b1bb311f0b 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -536,7 +536,7 @@ public: std::string curRespawnDelayStr = secsToTimeString(uint64(curRespawnDelay),true); std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true); - handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetDBTableGUIDLow(), faction, npcflags, Entry, displayid, nativeid); + handler->PSendSysMessage(LANG_NPCINFO_CHAR, target->GetDBTableGUIDLow(), target->GetGUIDLow(), faction, npcflags, Entry, displayid, nativeid); handler->PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel()); handler->PSendSysMessage(LANG_NPCINFO_HEALTH,target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth()); handler->PSendSysMessage(LANG_NPCINFO_FLAGS, target->GetUInt32Value(UNIT_FIELD_FLAGS), target->GetUInt32Value(UNIT_DYNAMIC_FLAGS), target->getFaction()); |