From 86939aeb9673d5b95a73305094cef8ebec09bd76 Mon Sep 17 00:00:00 2001 From: Jon <> Date: Wed, 21 Aug 2024 16:18:49 +0100 Subject: [PATCH] Fixed issues with redirectmap --- GuildWarsPartySearch.Bot/Dependencies/Headquarter | 2 +- GuildWarsPartySearch.Bot/gw-helper.c | 2 +- GuildWarsPartySearch.Bot/main.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/GuildWarsPartySearch.Bot/Dependencies/Headquarter b/GuildWarsPartySearch.Bot/Dependencies/Headquarter index 4a9e509..0f8bb8d 160000 --- a/GuildWarsPartySearch.Bot/Dependencies/Headquarter +++ b/GuildWarsPartySearch.Bot/Dependencies/Headquarter @@ -1 +1 @@ -Subproject commit 4a9e509f23c0bc909e34b0ac2b2056f72d51fe6b +Subproject commit 0f8bb8dd65eb650ee2bd2f840f99f7704245223a diff --git a/GuildWarsPartySearch.Bot/gw-helper.c b/GuildWarsPartySearch.Bot/gw-helper.c index 4823183..8c7369c 100644 --- a/GuildWarsPartySearch.Bot/gw-helper.c +++ b/GuildWarsPartySearch.Bot/gw-helper.c @@ -353,7 +353,7 @@ static int travel_wait(int map_id, District district, uint16_t district_number) } else { // RedirectMap if we're NOT already in the same map; server will drop connection otherwise - RedirectMap(map_id, district, district_number); + RedirectMap(map_id); } //Travel(map_id, district, district_number); diff --git a/GuildWarsPartySearch.Bot/main.cpp b/GuildWarsPartySearch.Bot/main.cpp index cdb16d3..76381c1 100644 --- a/GuildWarsPartySearch.Bot/main.cpp +++ b/GuildWarsPartySearch.Bot/main.cpp @@ -425,6 +425,7 @@ static void collect_instance_info() { district_number = GetDistrictNumber(); GetCharacterName(character_name, ARRAY_SIZE(character_name)); GetAccountUuid(account_uuid, ARRAY_SIZE(account_uuid)); + LogInfo("collect_instance_info: map %d, district %d, district_number %d, district_region %d", map_id, district, district_number, GetDistrictRegion()); } static void on_map_entered(Event* event, void* params) { @@ -654,6 +655,7 @@ static void ensure_correct_outpost() { retries = 50; // District full, more retries } } + collect_instance_info(); if (!in_correct_outpost()) { exit_with_status("Couldn't travel to outpost", 1); }