mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-11 03:31:08 +00:00
Decouple zone calls, cleanup logic
This commit is contained in:
@@ -53,6 +53,7 @@
|
||||
#include "worldserver.h"
|
||||
#include "zone.h"
|
||||
#include "zonedb.h"
|
||||
#include "zone_store.h"
|
||||
|
||||
extern QueryServ* QServ;
|
||||
extern Zone* zone;
|
||||
@@ -129,7 +130,7 @@ bool Client::Process() {
|
||||
CheckManaEndUpdate();
|
||||
|
||||
if (dead && dead_timer.Check()) {
|
||||
database.MoveCharacterToZone(GetName(), content_db.GetZoneName(m_pp.binds[0].zoneId));
|
||||
database.MoveCharacterToZone(GetName(), m_pp.binds[0].zoneId);
|
||||
|
||||
m_pp.zone_id = m_pp.binds[0].zoneId;
|
||||
m_pp.zoneInstance = m_pp.binds[0].instance_id;
|
||||
@@ -2087,7 +2088,7 @@ void Client::HandleRespawnFromHover(uint32 Option)
|
||||
|
||||
m_pp.zone_id = chosen->zone_id;
|
||||
m_pp.zoneInstance = chosen->instance_id;
|
||||
database.MoveCharacterToZone(CharacterID(), content_db.GetZoneName(chosen->zone_id));
|
||||
database.MoveCharacterToZone(CharacterID(), chosen->zone_id);
|
||||
|
||||
Save();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user