From 15f217b594cc42b90702a0752a4d4bc37dd070f7 Mon Sep 17 00:00:00 2001 From: KimLS Date: Mon, 1 Sep 2014 15:48:22 -0700 Subject: [PATCH 1/3] Fixed non-conforming sql files. --- .../2014_08_23_Complete_QueryServ_Rules_Disabled.sql} | 0 .../2014_08_23_Complete_QueryServ_Rules_Enabled.sql} | 0 .../2014_08_23_Complete_QueryServ_Table_Structures.sql} | 0 .../2014_08_23_player_events_and_player_aa_rate_hourly.sql} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename utils/sql/git/{queryserv/required/Complete_QueryServ_Rules_Disabled.sql => optional/2014_08_23_Complete_QueryServ_Rules_Disabled.sql} (100%) rename utils/sql/git/{queryserv/required/Complete_QueryServ_Rules_Enabled.sql => optional/2014_08_23_Complete_QueryServ_Rules_Enabled.sql} (100%) rename utils/sql/git/{queryserv/required/Complete_QueryServ_Table_Structures.sql => required/2014_08_23_Complete_QueryServ_Table_Structures.sql} (100%) rename utils/sql/git/{queryserv/required/08_23_2014_player_events_and_player_aa_rate_hourly.sql => required/2014_08_23_player_events_and_player_aa_rate_hourly.sql} (100%) diff --git a/utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Disabled.sql b/utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Disabled.sql similarity index 100% rename from utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Disabled.sql rename to utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Disabled.sql diff --git a/utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Enabled.sql b/utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Enabled.sql similarity index 100% rename from utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Enabled.sql rename to utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Enabled.sql diff --git a/utils/sql/git/queryserv/required/Complete_QueryServ_Table_Structures.sql b/utils/sql/git/required/2014_08_23_Complete_QueryServ_Table_Structures.sql similarity index 100% rename from utils/sql/git/queryserv/required/Complete_QueryServ_Table_Structures.sql rename to utils/sql/git/required/2014_08_23_Complete_QueryServ_Table_Structures.sql diff --git a/utils/sql/git/queryserv/required/08_23_2014_player_events_and_player_aa_rate_hourly.sql b/utils/sql/git/required/2014_08_23_player_events_and_player_aa_rate_hourly.sql similarity index 100% rename from utils/sql/git/queryserv/required/08_23_2014_player_events_and_player_aa_rate_hourly.sql rename to utils/sql/git/required/2014_08_23_player_events_and_player_aa_rate_hourly.sql From 8dd00f52888b8f6227aa75eb4d9325825a12a404 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Tue, 2 Sep 2014 02:39:03 -0400 Subject: [PATCH 2/3] Fix crash issue in zone/hate_list.cpp --- changelog.txt | 3 +++ zone/hate_list.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index de7572176..5f24fcba9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 09/02/2014 == +demonstar55: crash fix checking DivineAura in hate_list.cpp + == 08/31/2014 == KLS: Fixed a bug in fishing in S3D zones KLS: Fixed a bug in turnins with new any abstraction diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp index 86b20d313..f26615877 100644 --- a/zone/hate_list.cpp +++ b/zone/hate_list.cpp @@ -163,7 +163,7 @@ Mob* HateList::GetClosest(Mob *hater) { ++iterator; } - if (close == 0 && hater->IsNPC() || close->DivineAura()) + if ((!close && hater->IsNPC()) || (close && close->DivineAura())) close = hater->CastToNPC()->GetHateTop(); return close; From 41d57ddab6e55a529eb9807f2a74c53c665954d9 Mon Sep 17 00:00:00 2001 From: Arthur Dene Ice Date: Tue, 2 Sep 2014 10:54:42 -0700 Subject: [PATCH 3/3] Fixed bug with loading failing on Guild bank areas --- zone/guild_mgr.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp index 37cc7a3de..927ca16f6 100644 --- a/zone/guild_mgr.cpp +++ b/zone/guild_mgr.cpp @@ -686,19 +686,26 @@ bool GuildBankManager::Load(uint32 guildID) else whoFor[0] = '\0'; - if(slot < 0 || - ((area != GuildBankMainArea || slot >= GUILD_BANK_MAIN_AREA_SIZE) || - (area == GuildBankMainArea || slot >= GUILD_BANK_DEPOSIT_AREA_SIZE))) + if(slot < 0) continue; - bank->Items.MainArea[slot].ItemID = itemID; - bank->Items.MainArea[slot].Quantity = qty; + GuildBankItem *itemSection = nullptr; - strn0cpy(bank->Items.MainArea[slot].Donator, donator, sizeof(donator)); + if (area == GuildBankMainArea && slot < GUILD_BANK_MAIN_AREA_SIZE) + itemSection = bank->Items.MainArea; + else if (area != GuildBankMainArea && slot < GUILD_BANK_DEPOSIT_AREA_SIZE) + itemSection = bank->Items.DepositArea; + else + continue; - bank->Items.MainArea[slot].Permissions = permissions; + itemSection[slot].ItemID = itemID; + itemSection[slot].Quantity = qty; - strn0cpy(bank->Items.MainArea[slot].WhoFor, whoFor, sizeof(whoFor)); + strn0cpy(itemSection[slot].Donator, donator, sizeof(donator)); + + itemSection[slot].Permissions = permissions; + + strn0cpy(itemSection[slot].WhoFor, whoFor, sizeof(whoFor)); } Banks.push_back(bank);