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

Merge pull request #21 from EQEmu/master

Browse Source 
Merge from base.
This commit is contained in:
Paul Coene 2020-09-21 10:27:18 -04:00 committed by GitHub
commit 27e19900ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zone/lua_general.cpp
View File

@ -3085,9 +3085,13 @@ luabind::scope lua_register_skills() {
.enum_("constants")
[
luabind::value("1HBlunt", EQ::skills::Skill1HBlunt),
luabind::value("Blunt1H", EQ::skills::Skill1HBlunt),
luabind::value("1HSlashing", EQ::skills::Skill1HSlashing),
luabind::value("Slashing1H", EQ::skills::Skill1HSlashing),
luabind::value("2HBlunt", EQ::skills::Skill2HBlunt),
luabind::value("Blunt2H", EQ::skills::Skill2HBlunt),
luabind::value("2HSlashing", EQ::skills::Skill2HSlashing),
luabind::value("Slashing2H", EQ::skills::Skill2HSlashing),
luabind::value("Abjuration", EQ::skills::SkillAbjuration),
luabind::value("Alteration", EQ::skills::SkillAlteration),
luabind::value("ApplyPoison", EQ::skills::SkillApplyPoison),
@ -3122,6 +3126,7 @@ luabind::scope lua_register_skills() {
luabind::value("Parry", EQ::skills::SkillParry),
luabind::value("PickLock", EQ::skills::SkillPickLock),
luabind::value("1HPiercing", EQ::skills::Skill1HPiercing),
luabind::value("Piercing1H", EQ::skills::Skill1HPiercing),
luabind::value("Riposte", EQ::skills::SkillRiposte),
luabind::value("RoundKick", EQ::skills::SkillRoundKick),
luabind::value("SafeFall", EQ::skills::SkillSafeFall),
@ -3163,6 +3168,7 @@ luabind::scope lua_register_skills() {
luabind::value("RemoveTraps", EQ::skills::SkillRemoveTraps),
luabind::value("TripleAttack", EQ::skills::SkillTripleAttack),
luabind::value("2HPiercing", EQ::skills::Skill2HPiercing),
luabind::value("Piercing2H", EQ::skills::Skill2HPiercing),
luabind::value("HIGHEST_SKILL", EQ::skills::HIGHEST_SKILL)
];
}

2
zone/spells.cpp
View File

@ -2353,7 +2353,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
SpellOnTarget(spell_id, spell_target);
#ifdef GROUP_BUFF_PETS
//pet too
if (spells[spell_id].targettype != ST_GroupNoPets && spell_target->GetPet() && HasPetAffinity() && !spell_target->GetPet()->IsCharmed())
if (spells[spell_id].targettype != ST_GroupNoPets && spell_target->GetPet() && spell_target->HasPetAffinity() && !spell_target->GetPet()->IsCharmed())
SpellOnTarget(spell_id, spell_target->GetPet());
#endif
}