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

[Feature] Add support to crosszone/worldwide spells to affect bot pets (#4036)

Browse Source 
* [Bug Fix] Move break in ServerOP_WWSpell handler

# Notes
- This break was cancelling loop early, m

* [Feature] Add support to crosszone/worldwide spells to affect bot pets
This commit is contained in:
Alex King 2024-02-01 05:27:00 -05:00 committed by GitHub
parent 24578f6c1e
commit 6efd7c5177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
zone/worldserver.cpp
View File

@ -2706,6 +2706,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) {
b->ApplySpellBuff(s->spell_id); b->ApplySpellBuff(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->ApplySpellBuff(s->spell_id);
}
}
} }
} }
@ -2728,6 +2734,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) {
b->BuffFadeBySpellID(s->spell_id); b->BuffFadeBySpellID(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->BuffFadeBySpellID(s->spell_id);
}
}
} }
} }
@ -2830,6 +2842,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) {
b->ApplySpellBuff(s->spell_id); b->ApplySpellBuff(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->ApplySpellBuff(s->spell_id);
}
}
} }
} }
@ -2852,6 +2870,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) {
b->BuffFadeBySpellID(s->spell_id); b->BuffFadeBySpellID(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->BuffFadeBySpellID(s->spell_id);
}
}
} }
} }
@ -2881,6 +2905,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) {
b->ApplySpellBuff(s->spell_id); b->ApplySpellBuff(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->ApplySpellBuff(s->spell_id);
}
}
} }
} }
@ -2903,6 +2933,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) {
b->BuffFadeBySpellID(s->spell_id); b->BuffFadeBySpellID(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->BuffFadeBySpellID(s->spell_id);
}
}
} }
} }
@ -2932,6 +2968,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) {
b->ApplySpellBuff(s->spell_id); b->ApplySpellBuff(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->ApplySpellBuff(s->spell_id);
}
}
} }
} }
@ -2954,6 +2996,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c->CharacterID())) {
b->BuffFadeBySpellID(s->spell_id); b->BuffFadeBySpellID(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->BuffFadeBySpellID(s->spell_id);
}
}
} }
} }
@ -3309,6 +3357,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) {
b->ApplySpellBuff(s->spell_id); b->ApplySpellBuff(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->ApplySpellBuff(s->spell_id);
}
}
} }
} }
@ -3329,6 +3383,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) { if (RuleB(Zone, AllowCrossZoneSpellsOnBots)) {
for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) { for (const auto& b : entity_list.GetBotListByCharacterID(c.second->CharacterID())) {
b->BuffFadeBySpellID(s->spell_id); b->BuffFadeBySpellID(s->spell_id);
if (RuleB(Zone, AllowCrossZoneSpellsOnPets)) {
if (b->HasPet()) {
b->GetPet()->BuffFadeBySpellID(s->spell_id);
}
}
} }
} }
@ -3345,8 +3405,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
} }
} }
} }
break;
} }
break;
} }
case ServerOP_WWTaskUpdate: case ServerOP_WWTaskUpdate:
{ {