From d95fdda30fb02a403d67096e51d92a63df431d11 Mon Sep 17 00:00:00 2001 From: Michael Cook Date: Tue, 3 Dec 2013 16:12:13 -0500 Subject: [PATCH] Fix procing off of unattackable things This /might/ be a little restrictive, but it should prevent easy farming of bone chips from Boneshear etc --- changelog.txt | 1 + zone/attack.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/changelog.txt b/changelog.txt index ee7dbb992..b02221f42 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- == 12/03/2013 == demonstar55: Added #showspellslist to view a mobs spell list +demonstar55: Fix procing off of unattackable things == 12/02/2013 == JJ: Bandaid fix to CopyCharacter function. diff --git a/zone/attack.cpp b/zone/attack.cpp index 1c2c52b2d..7cf35e2a2 100644 --- a/zone/attack.cpp +++ b/zone/attack.cpp @@ -3844,6 +3844,11 @@ void Mob::TryWeaponProc(const ItemInst* weapon_g, Mob *on, uint16 hand) { return; } + if (!IsAttackAllowed(on)) { + mlog(COMBAT__PROCS, "Preventing procing off of unattackable things."); + return; + } + if(!weapon_g) { TryWeaponProc(nullptr, (const Item_Struct*)nullptr, on, hand); return;