From 4cb7d9a3524aae7cafa2fa9a413753c29f89970b Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 22 Sep 2016 00:32:01 -0400 Subject: [PATCH] Remove ability for charmed NPCs from summoning These rules do not appear to be true on live They also don't look to have ever been true? --- zone/mob.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/zone/mob.cpp b/zone/mob.cpp index 8aa889719..fb4c14bf2 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -2584,14 +2584,12 @@ bool Mob::PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, fl bool Mob::HateSummon() { // check if mob has ability to summon // 97% is the offical % that summoning starts on live, not 94 - // if the mob can summon and is charmed, it can only summon mobs it has LoS to - Mob* mob_owner = nullptr; - if(GetOwnerID()) - mob_owner = entity_list.GetMob(GetOwnerID()); + if (IsCharmed()) + return false; int summon_level = GetSpecialAbility(SPECATK_SUMMON); if(summon_level == 1 || summon_level == 2) { - if(!GetTarget() || (mob_owner && mob_owner->IsClient() && !CheckLosFN(GetTarget()))) { + if(!GetTarget()) { return false; } } else {