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

Conflicts:
	changelog.txt

changelog.txt

@@ -4,6 +4,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 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/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 ==
 KLS: Fixed a bug in fishing in S3D zones

zone/guild_mgr.cpp

@@ -690,19 +690,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);

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;