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

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source 
Conflicts:
	changelog.txt
This commit is contained in:
SecretsOTheP 2014-09-02 21:18:30 -04:00
commit 7301182b3e
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -4,6 +4,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
Secrets: Identified OP_GuildPromote for RoF clients. Secrets: Identified OP_GuildPromote for RoF clients.
Secrets: Fixed promotion, demotion, transferring a leader and displaying of client ranks in the Rain of Fear client. The rain of fear client, as such, will only have 3 ranks like the other clients, but supports a theoretical 8 ranks later. Secrets: Fixed promotion, demotion, transferring a leader and displaying of client ranks in the Rain of Fear client. The rain of fear client, as such, will only have 3 ranks like the other clients, but supports a theoretical 8 ranks later.
Secrets/Akkadius: Fixed an issue involving character name lookup in the new DB code. Secrets/Akkadius: Fixed an issue involving character name lookup in the new DB code.
demonstar55: crash fix checking DivineAura in hate_list.cpp
== 08/31/2014 == == 08/31/2014 ==
KLS: Fixed a bug in fishing in S3D zones KLS: Fixed a bug in fishing in S3D zones

0
utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Disabled.sql → utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Disabled.sql
View File

0
utils/sql/git/queryserv/required/Complete_QueryServ_Rules_Enabled.sql → utils/sql/git/optional/2014_08_23_Complete_QueryServ_Rules_Enabled.sql
View File

0
utils/sql/git/queryserv/required/Complete_QueryServ_Table_Structures.sql → utils/sql/git/required/2014_08_23_Complete_QueryServ_Table_Structures.sql
View File

0
utils/sql/git/queryserv/required/08_23_2014_player_events_and_player_aa_rate_hourly.sql → utils/sql/git/required/2014_08_23_player_events_and_player_aa_rate_hourly.sql
View File

23
zone/guild_mgr.cpp
View File

@ -690,19 +690,26 @@ bool GuildBankManager::Load(uint32 guildID)
else else
whoFor[0] = '\0'; whoFor[0] = '\0';
if(slot < 0 || if(slot < 0)
((area != GuildBankMainArea || slot >= GUILD_BANK_MAIN_AREA_SIZE) ||
(area == GuildBankMainArea || slot >= GUILD_BANK_DEPOSIT_AREA_SIZE)))
continue; continue;
bank->Items.MainArea[slot].ItemID = itemID; GuildBankItem *itemSection = nullptr;
bank->Items.MainArea[slot].Quantity = qty;
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); Banks.push_back(bank);

2
zone/hate_list.cpp
View File

@ -163,7 +163,7 @@ Mob* HateList::GetClosest(Mob *hater) {
++iterator; ++iterator;
} }
if (close == 0 && hater->IsNPC() || close->DivineAura()) if ((!close && hater->IsNPC()) || (close && close->DivineAura()))
close = hater->CastToNPC()->GetHateTop(); close = hater->CastToNPC()->GetHateTop();
return close; return close;