mirror of
https://github.com/EQEmu/Server.git
synced 2026-01-31 05:13:52 +00:00
Post merge fixes
This commit is contained in:
parent
e03ca7f65e
commit
954b0c5106
@ -417,7 +417,7 @@ void QuestManager::ZoneGroup(const char *zone_name) {
|
||||
ztz->response = 0;
|
||||
ztz->current_zone_id = zone->GetZoneID();
|
||||
ztz->current_instance_id = zone->GetInstanceID();
|
||||
ztz->requested_zone_id = database.GetZoneID(zone_name);
|
||||
ztz->requested_zone_id = ZoneID(zone_name);
|
||||
ztz->admin = initiator->Admin();
|
||||
strcpy(ztz->name, initiator->GetName());
|
||||
ztz->guild_id = initiator->GuildID();
|
||||
@ -434,7 +434,7 @@ void QuestManager::ZoneGroup(const char *zone_name) {
|
||||
ztz->response = 0;
|
||||
ztz->current_zone_id = zone->GetZoneID();
|
||||
ztz->current_instance_id = zone->GetInstanceID();
|
||||
ztz->requested_zone_id = database.GetZoneID(zone_name);
|
||||
ztz->requested_zone_id = ZoneID(zone_name);
|
||||
ztz->admin = group_member->Admin();
|
||||
strcpy(ztz->name, group_member->GetName());
|
||||
ztz->guild_id = group_member->GuildID();
|
||||
@ -456,7 +456,7 @@ void QuestManager::ZoneRaid(const char *zone_name) {
|
||||
ztz->response = 0;
|
||||
ztz->current_zone_id = zone->GetZoneID();
|
||||
ztz->current_instance_id = zone->GetInstanceID();
|
||||
ztz->requested_zone_id = database.GetZoneID(zone_name);
|
||||
ztz->requested_zone_id = ZoneID(zone_name);
|
||||
ztz->admin = initiator->Admin();
|
||||
strcpy(ztz->name, initiator->GetName());
|
||||
ztz->guild_id = initiator->GuildID();
|
||||
@ -473,7 +473,7 @@ void QuestManager::ZoneRaid(const char *zone_name) {
|
||||
ztz->response = 0;
|
||||
ztz->current_zone_id = zone->GetZoneID();
|
||||
ztz->current_instance_id = zone->GetInstanceID();
|
||||
ztz->requested_zone_id = database.GetZoneID(zone_name);
|
||||
ztz->requested_zone_id = ZoneID(zone_name);
|
||||
ztz->admin = raid_member->Admin();
|
||||
strcpy(ztz->name, raid_member->GetName());
|
||||
ztz->guild_id = raid_member->GuildID();
|
||||
|
||||
@ -452,7 +452,7 @@ void Client::MoveZone(const char *zone_short_name) {
|
||||
ztz->response = 0;
|
||||
ztz->current_zone_id = zone->GetZoneID();
|
||||
ztz->current_instance_id = zone->GetInstanceID();
|
||||
ztz->requested_zone_id = database.GetZoneID(zone_short_name);
|
||||
ztz->requested_zone_id = ZoneID(zone_short_name);
|
||||
ztz->admin = Admin();
|
||||
strcpy(ztz->name, GetName());
|
||||
ztz->guild_id = GuildID();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user