pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-22 11:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #401 from noudess/master

Browse Source 
Check to make sure we're a client before a CastToClient().
This commit is contained in:
Alex 2015-04-30 16:59:39 -07:00
commit 3846dc2bbc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/attack.cpp
View File

@ -983,9 +983,11 @@ int Mob::GetWeaponDamage(Mob *against, const ItemInst *weapon_item, uint32 *hate
} }
else{ else{
bool MagicGloves=false; bool MagicGloves=false;
ItemInst *gloves=CastToClient()->GetInv().GetItem(MainHands); if (IsClient()) {
if (gloves != nullptr) { ItemInst *gloves=CastToClient()->GetInv().GetItem(MainHands);
MagicGloves = gloves->GetItem()->Magic; if (gloves != nullptr) {
MagicGloves = gloves->GetItem()->Magic;
}
} }
if((GetClass() == MONK || GetClass() == BEASTLORD)) { if((GetClass() == MONK || GetClass() == BEASTLORD)) {