pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-07 21:32:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Updated command 'editmassrespawn' queries to use resolved names over aliases

Browse Source
This commit is contained in:
Uleat 2020-03-29 18:02:27 -04:00
parent a2b381bc9e
commit b94fdda429
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zone/command.cpp
View File

@ -6557,14 +6557,14 @@ void command_editmassrespawn(Client* c, const Seperator* sep)
std::string query = fmt::format( std::string query = fmt::format(
SQL( SQL(
SELECT tc.id, ta.spawngroupID, ta.id, tc.name, ta.respawntime SELECT npc_types.id, spawn2.spawngroupID, spawn2.id, npc_types.name, spawn2.respawntime
FROM spawn2 ta FROM spawn2
INNER JOIN spawnentry tb ON ta.spawngroupID = tb.spawngroupID INNER JOIN spawnentry ON spawn2.spawngroupID = spawnentry.spawngroupID
INNER JOIN npc_types tc ON tb.npcID = tc.id INNER JOIN npc_types ON spawnentry.npcID = npc_types.id
WHERE ta.zone LIKE '{}' WHERE spawn2.zone LIKE '{}'
AND ta.version = '{}' AND spawn2.version = '{}'
AND tc.name LIKE '{}{}{}' AND npc_types.name LIKE '{}{}{}'
ORDER BY tc.id, ta.spawngroupID, ta.id ORDER BY npc_types.id, spawn2.spawngroupID, spawn2.id
), ),
zone->GetShortName(), zone->GetShortName(),
zone->GetInstanceVersion(), zone->GetInstanceVersion(),
@ -6613,13 +6613,13 @@ void command_editmassrespawn(Client* c, const Seperator* sep)
UPDATE spawn2 UPDATE spawn2
SET respawntime = '{}' SET respawntime = '{}'
WHERE id IN ( WHERE id IN (
SELECT ta.id SELECT spawn2.id
FROM spawn2 ta FROM spawn2
INNER JOIN spawnentry tb ON ta.spawngroupID = tb.spawngroupID INNER JOIN spawnentry ON spawn2.spawngroupID = spawnentry.spawngroupID
INNER JOIN npc_types tc ON tb.npcID = tc.id INNER JOIN npc_types ON spawnentry.npcID = npc_types.id
WHERE ta.zone LIKE '{}' WHERE spawn2.zone LIKE '{}'
AND ta.version = '{}' AND spawn2.version = '{}'
AND tc.name LIKE '{}{}{}' AND npc_types.name LIKE '{}{}{}'
) )
), ),
change_respawn_seconds, change_respawn_seconds,