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

Fix zone crash with TryWeaponProc

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-02-28 02:56:36 -05:00
parent cb633e4b6a
commit c030cfe0ad
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/attack.cpp
View File

@ -4080,7 +4080,7 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct *weapon, Mob *on
} }
} }
if (!proced) { if (!proced && inst) {
for (int r = 0; r < MAX_AUGMENT_SLOTS; r++) { for (int r = 0; r < MAX_AUGMENT_SLOTS; r++) {
const ItemInst *aug_i = inst->GetAugment(r); const ItemInst *aug_i = inst->GetAugment(r);
if (!aug_i) // no aug, try next slot! if (!aug_i) // no aug, try next slot!
@ -4098,12 +4098,10 @@ void Mob::TryWeaponProc(const ItemInst *inst, const Item_Struct *weapon, Mob *on
Mob *own = GetOwner(); Mob *own = GetOwner();
if (own) if (own)
own->Message_StringID(13, PROC_PETTOOLOW); own->Message_StringID(13, PROC_PETTOOLOW);
} } else {
else {
Message_StringID(13, PROC_TOOLOW); Message_StringID(13, PROC_TOOLOW);
} }
} } else {
else {
ExecWeaponProc(aug_i, aug->Proc.Effect, on); ExecWeaponProc(aug_i, aug->Proc.Effect, on);
break; break;
} }