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

bug fix for push while rooted (#1949)

Browse Source
This commit is contained in:
KayenEQ 2022-01-28 22:05:29 -05:00 committed by GitHub
parent e850d80656
commit afdbc0ce80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/mob.h
View File

@ -1059,6 +1059,7 @@ public:
inline const bool IsRoamer() const { return roamer; } inline const bool IsRoamer() const { return roamer; }
inline const int GetWanderType() const { return wandertype; } inline const int GetWanderType() const { return wandertype; }
inline const bool IsRooted() const { return rooted || permarooted; } inline const bool IsRooted() const { return rooted || permarooted; }
inline const bool IsPermaRooted() const { return permarooted; }
int GetSnaredAmount(); int GetSnaredAmount();
inline const bool IsPseudoRooted() const { return pseudo_rooted; } inline const bool IsPseudoRooted() const { return pseudo_rooted; }
inline void SetPseudoRoot(bool prState) { pseudo_rooted = prState; } inline void SetPseudoRoot(bool prState) { pseudo_rooted = prState; }

2
zone/spells.cpp
View File

@ -4235,7 +4235,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, int reflect_effectivenes
spelltar->CastToClient()->cheat_manager.SetExemptStatus(KnockBack, true); spelltar->CastToClient()->cheat_manager.SetExemptStatus(KnockBack, true);
} }
} }
else if (RuleB(Spells, NPCSpellPush) && !permarooted && !IsPseudoRooted() && spelltar->ForcedMovement == 0) { else if (RuleB(Spells, NPCSpellPush) && !spelltar->IsPermaRooted() && !spelltar->IsPseudoRooted() && spelltar->ForcedMovement == 0) {
spelltar->m_Delta.x += action->force * g_Math.FastSin(action->hit_heading); spelltar->m_Delta.x += action->force * g_Math.FastSin(action->hit_heading);
spelltar->m_Delta.y += action->force * g_Math.FastCos(action->hit_heading); spelltar->m_Delta.y += action->force * g_Math.FastCos(action->hit_heading);
spelltar->m_Delta.z += action->hit_pitch; spelltar->m_Delta.z += action->hit_pitch;