pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-16 18:02:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Charm] Push up fragments of Kayen's PR back up (#1659)

Browse Source
This commit is contained in:
Chris Miles 2021-10-31 00:04:48 -05:00 committed by GitHub
parent 1231d44b55
commit 9e7a763482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
zone/spell_effects.cpp
View File

@ -728,11 +728,32 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
snprintf(effect_desc, _EDLEN, "Charm: %+i (up to lvl %d)", effect_value, spell.max[i]);
#endif
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;
}
if(IsNPC())
{
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()) {
CastToNPC()->SaveGuardSpotCharm();
}
InterruptSpell();
@ -740,24 +761,6 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
entity_list.RemoveFromTargets(this);
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();
if(my_pet)
{