aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShocker <none@none>2010-09-26 23:46:31 +0300
committerShocker <none@none>2010-09-26 23:46:31 +0300
commit75f5e9756ea6f59dac820c50274a955dc69fca01 (patch)
tree450de6c0c09c2c632995d09b7010b57cfd729b9b
parent7375951ea831b1f06cd087f65bd9d8ee14a34852 (diff)
Core/Commands: Allow .gobject near to print gameobject entry too
--HG-- branch : trunk
-rw-r--r--sql/base/world_database.sql2
-rw-r--r--sql/updates/10083_world_trinity_string.sql1
-rw-r--r--src/server/game/Chat/Commands/Level2.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index ca6d7181161..182aacdc8e7 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -27374,7 +27374,7 @@ INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_
(514, '%d - |cffffffff|Hcreature_entry:%d|h[%s]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(515, '%d - |cffffffff|Hcreature:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(516, '%d - |cffffffff|Hgameobject_entry:%d|h[%s]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-(517, '%d - |cffffffff|Hgameobject:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+(517, '%d (Entry: %d) - |cffffffff|Hgameobject:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(518, '%d - |cffffffff|Hitemset:%d|h[%s %s]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(519, '|cffffffff|Htele:%s|h[%s]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
(520, '%d - |cffffffff|Hspell:%d|h[%s]|h|r ', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
diff --git a/sql/updates/10083_world_trinity_string.sql b/sql/updates/10083_world_trinity_string.sql
new file mode 100644
index 00000000000..3564cab902d
--- /dev/null
+++ b/sql/updates/10083_world_trinity_string.sql
@@ -0,0 +1 @@
+UPDATE `trinity_string` SET `content_default` = '%d (Entry: %d) - |cffffffff|Hgameobject:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r ' WHERE `entry` = 517;
diff --git a/src/server/game/Chat/Commands/Level2.cpp b/src/server/game/Chat/Commands/Level2.cpp
index 1916b77bb88..a8be083982e 100644
--- a/src/server/game/Chat/Commands/Level2.cpp
+++ b/src/server/game/Chat/Commands/Level2.cpp
@@ -814,7 +814,7 @@ bool ChatHandler::HandleGameObjectNearCommand(const char* args)
if (!gInfo)
continue;
- PSendSysMessage(LANG_GO_LIST_CHAT, guid, guid, gInfo->name, x, y, z, mapid);
+ PSendSysMessage(LANG_GO_LIST_CHAT, guid, entry, guid, gInfo->name, x, y, z, mapid);
++count;
} while (result->NextRow());