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

Revert "[BugFix] Charm Targeting and other issues. (#1655)"

Browse Source 
This reverts commit df3161455a2314e0e8b774bbbe328ee5d0a41fe9.
This commit is contained in:
Akkadius 2021-10-30 22:18:40 -05:00
parent 873f1f7f34
commit 1231d44b55
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/entity.cpp
View File

@ -1514,10 +1514,8 @@ void EntityList::RemoveFromTargets(Mob *mob, bool RemoveFromXTargets)
mob->CastToClient()->RemoveXTarget(m, false); mob->CastToClient()->RemoveXTarget(m, false);
} }
if (m->IsAIControlled()) {
m->RemoveFromHateList(mob); m->RemoveFromHateList(mob);
} }
}
} }
void EntityList::RemoveFromXTargets(Mob *mob) void EntityList::RemoveFromXTargets(Mob *mob)

2
zone/mob.cpp
View File

@ -2875,7 +2875,7 @@ bool Mob::RemoveFromHateList(Mob* mob)
ResetAssistCap(); ResetAssistCap();
} }
} }
if(IsAIControlled() && GetTarget() == mob) if(GetTarget() == mob)
{ {
SetTarget(hate_list.GetEntWithMostHateOnList(this)); SetTarget(hate_list.GetEntWithMostHateOnList(this));
} }

39
zone/spell_effects.cpp
View File

@ -731,27 +731,6 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
if (!caster) // can't be someone's pet unless we know who that someone is if (!caster) // can't be someone's pet unless we know who that someone is
break; break;
if (IsClient() && caster->IsClient()) {
caster->Message(Chat::White, "Unable to cast charm on a fellow player.");
BuffFadeByEffect(SE_Charm);
break;
}
else if (IsCorpse()) {
caster->Message(Chat::White, "Unable to cast charm on a corpse.");
BuffFadeByEffect(SE_Charm);
break;
}
else if (caster->GetPet() != nullptr && caster->IsClient()) {
caster->Message(Chat::White, "You cannot charm something when you already have a pet.");
BuffFadeByEffect(SE_Charm);
break;
}
else if (GetOwner()) {
caster->Message(Chat::White, "You cannot charm someone else's pet!");
BuffFadeByEffect(SE_Charm);
break;
}
if(IsNPC()) if(IsNPC())
{ {
CastToNPC()->SaveGuardSpotCharm(); CastToNPC()->SaveGuardSpotCharm();
@ -761,6 +740,24 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
entity_list.RemoveFromTargets(this); entity_list.RemoveFromTargets(this);
WipeHateList(); WipeHateList();
if (IsClient() && caster->IsClient()) {
caster->Message(Chat::White, "Unable to cast charm on a fellow player.");
BuffFadeByEffect(SE_Charm);
break;
} else if(IsCorpse()) {
caster->Message(Chat::White, "Unable to cast charm on a corpse.");
BuffFadeByEffect(SE_Charm);
break;
} else if(caster->GetPet() != nullptr && caster->IsClient()) {
caster->Message(Chat::White, "You cannot charm something when you already have a pet.");
BuffFadeByEffect(SE_Charm);
break;
} else if(GetOwner()) {
caster->Message(Chat::White, "You cannot charm someone else's pet!");
BuffFadeByEffect(SE_Charm);
break;
}
Mob *my_pet = GetPet(); Mob *my_pet = GetPet();
if(my_pet) if(my_pet)
{ {