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

[API] mob->SpellEffect small perl fix (#1820)

Browse Source 
* Update perl_mob.cpp

* Update perl_mob.cpp
This commit is contained in:
KayenEQ 2021-11-24 12:48:23 -05:00 committed by GitHub
parent 1a2897c423
commit 6ff7f7aa53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zone/perl_mob.cpp
View File

@ -4877,6 +4877,7 @@ XS(XS_Mob_SpellEffect) {
Client *client = nullptr; Client *client = nullptr;
uint32 caster_id = 0; uint32 caster_id = 0;
uint32 target_id = 0; uint32 target_id = 0;
bool nullclient = false;
VALIDATE_THIS_IS_MOB; VALIDATE_THIS_IS_MOB;
if (items > 2) { duration = (uint32) SvUV(ST(2)); } if (items > 2) { duration = (uint32) SvUV(ST(2)); }
if (items > 3) { finish_delay = (uint32) SvUV(ST(3)); } if (items > 3) { finish_delay = (uint32) SvUV(ST(3)); }
@ -4885,18 +4886,26 @@ XS(XS_Mob_SpellEffect) {
if (items > 6) { perm_effect = (bool) SvTRUE(ST(6)); } if (items > 6) { perm_effect = (bool) SvTRUE(ST(6)); }
if (items > 7) { if (items > 7) {
if (sv_derived_from(ST(7), "Client")) { if (sv_derived_from(ST(7), "Client")) {
IV tmp = SvIV((SV *) SvRV(ST(7))); IV tmp = SvIV((SV *)SvRV(ST(7)));
client = INT2PTR(Client *, tmp); client = INT2PTR(Client *, tmp);
} else }
Perl_croak(aTHX_ "client is not of type Client"); else {
if (client == nullptr) nullclient = true;
Perl_croak(aTHX_ "client is nullptr, avoiding crash."); }
if (client == nullptr) {
nullclient = true;
}
} }
if (items > 8) { caster_id = (uint32)SvUV(ST(8)); } if (items > 8) { caster_id = (uint32)SvUV(ST(8)); }
if (items > 9) { target_id = (uint32)SvUV(ST(9)); } if (items > 9) { target_id = (uint32)SvUV(ST(9)); }
if (nullclient) {
THIS->SendSpellEffect(effect, duration, finish_delay, zone_wide, unk20, perm_effect, 0, caster_id, target_id);
}
else {
THIS->SendSpellEffect(effect, duration, finish_delay, zone_wide, unk20, perm_effect, client, caster_id, target_id);
}
THIS->SendSpellEffect(effect, duration, finish_delay, zone_wide, unk20, perm_effect, client, caster_id, target_id);
} }
XSRETURN_EMPTY; XSRETURN_EMPTY;
} }