Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

RemoveSkillBonus should work on NPC's now, fixed/added some additional logging info for SpawnGroupByID

Browse Source
This commit is contained in:
Emagi 2024-09-13 06:45:15 -04:00
parent a597a993c2
commit 0a1692b9a0
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
source/WorldServer/LuaFunctions.cpp
View File

@ -2667,52 +2667,50 @@ int EQ2Emu_lua_RemoveSkillBonus(lua_State* state) {
return 0; return 0;
Spawn* spawn = lua_interface->GetSpawn(state); Spawn* spawn = lua_interface->GetSpawn(state);
LuaSpell* luaspell = lua_interface->GetCurrentSpell(state); LuaSpell* luaspell = lua_interface->GetCurrentSpell(state);
if (spawn && spawn->IsPlayer()) { lua_interface->ResetFunctionStack(state);
int32 spell_id = 0; int32 spell_id = 0;
if (luaspell && luaspell->spell && luaspell->caster) { if (luaspell && luaspell->spell && luaspell->caster) {
if(luaspell->resisted) { if(luaspell->resisted) {
lua_interface->ResetFunctionStack(state); return 0;
return 0; }
} spell_id = luaspell->spell->GetSpellID();
spell_id = luaspell->spell->GetSpellID(); ZoneServer* zone = luaspell->caster->GetZone();
ZoneServer* zone = luaspell->caster->GetZone(); Spawn* target = 0;
Spawn* target = 0; luaspell->MSpellTargets.readlock(__FUNCTION__, __LINE__);
luaspell->MSpellTargets.readlock(__FUNCTION__, __LINE__); for (int32 i = 0; i < luaspell->targets.size(); i++) {
for (int32 i = 0; i < luaspell->targets.size(); i++) { target = zone->GetSpawnByID(luaspell->targets[i]);
target = zone->GetSpawnByID(luaspell->targets[i]); if (target) {
if (target) { if (target->IsPlayer()) {
if (target->IsPlayer()) { ((Player*)target)->RemoveSkillBonus(spell_id);
((Player*)target)->RemoveSkillBonus(spell_id); Client* client = ((Player*)target)->GetClient();
Client* client = ((Player*)target)->GetClient(); if (client) {
if (client) { EQ2Packet* packet = ((Player*)target)->GetSkills()->GetSkillPacket(client->GetVersion());
EQ2Packet* packet = ((Player*)target)->GetSkills()->GetSkillPacket(client->GetVersion()); if (packet)
if (packet) client->QueuePacket(packet);
client->QueuePacket(packet);
}
} }
else if (target->IsNPC())
((NPC*)target)->RemoveSkillBonus(spell_id);
else
LogWrite(LUA__ERROR, 0, "LUA", "Error removing skill bonus on '%s'. Not a NPC or player.", spawn->GetName());
} }
else if (target->IsNPC())
((NPC*)target)->RemoveSkillBonus(spell_id);
else
LogWrite(LUA__ERROR, 0, "LUA", "Error removing skill bonus on '%s'. Not a NPC or player.", spawn->GetName());
} }
luaspell->MSpellTargets.releasereadlock(__FUNCTION__, __LINE__);
} }
else if (spawn) { luaspell->MSpellTargets.releasereadlock(__FUNCTION__, __LINE__);
if (spawn->IsPlayer()) { }
((Player*)spawn)->RemoveSkillBonus(spell_id); else if (spawn) {
Client* client = ((Player*)spawn)->GetClient(); if (spawn->IsPlayer()) {
if (client) { ((Player*)spawn)->RemoveSkillBonus(spell_id);
EQ2Packet* packet = ((Player*)spawn)->GetSkills()->GetSkillPacket(client->GetVersion()); Client* client = ((Player*)spawn)->GetClient();
if (packet) if (client) {
client->QueuePacket(packet); EQ2Packet* packet = ((Player*)spawn)->GetSkills()->GetSkillPacket(client->GetVersion());
} if (packet)
client->QueuePacket(packet);
} }
else if (spawn->IsNPC())
((NPC*)spawn)->RemoveSkillBonus(spell_id);
else
LogWrite(LUA__ERROR, 0, "LUA", "Error removing skill bonus on '%s'. Not a NPC or player.", spawn->GetName());
} }
else if (spawn->IsNPC())
((NPC*)spawn)->RemoveSkillBonus(spell_id);
else
LogWrite(LUA__ERROR, 0, "LUA", "Error removing skill bonus on '%s'. Not a NPC or player.", spawn->GetName());
} }
return 0; return 0;
} }
@ -10804,7 +10802,7 @@ int EQ2Emu_lua_SpawnGroupByID(lua_State* state) {
ZoneServer* zone = lua_interface->GetZone(state, 1); ZoneServer* zone = lua_interface->GetZone(state, 1);
if (!zone) { if (!zone) {
lua_interface->LogError("%s: LUA GetPlayersInZone command error: zone is not valid", lua_interface->GetScriptName(state)); lua_interface->LogError("%s: LUA SpawnGroupByID command error: zone is not valid", lua_interface->GetScriptName(state));
return 0; return 0;
} }
@ -10826,7 +10824,7 @@ int EQ2Emu_lua_SpawnGroupByID(lua_State* state) {
for (itr = locs->begin(); itr != locs->end(); itr++) { for (itr = locs->begin(); itr != locs->end(); itr++) {
SpawnLocation* location = zone->GetSpawnLocation(itr->second); SpawnLocation* location = zone->GetSpawnLocation(itr->second);
if (!location) { if (!location) {
lua_interface->LogError("%s: LUA SpawnGroupByID command error: no location found for the given ID (%u)", lua_interface->GetScriptName(state), itr->second); lua_interface->LogError("%s: LUA SpawnGroupByID command error: no location found for group id %u and the given ID (%u)", lua_interface->GetScriptName(state), group_id, itr->second);
return 0; return 0;
} }