pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-17 02:28:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' of https://github.com/neckkola/Server"

Browse Source 
This reverts commit 1826830637, reversing
changes made to 7c1a139991.
This commit is contained in:
neckkola
2022-05-18 19:03:37 -03:00
parent 1826830637
commit 4c644600b0
24 changed files with 535 additions and 3793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/entity.cpp
+3 -47
View File
@@ -2137,17 +2137,17 @@ Raid *EntityList::GetRaidByID(uint32 id)
return nullptr;
}
Raid* EntityList::GetRaidByClient(Client* client)
Raid *EntityList::GetRaidByClient(Client* client)
{
if (client->p_raid_instance) {
return client->p_raid_instance;
}
std::list<Raid*>::iterator iterator;
std::list<Raid *>::iterator iterator;
iterator = raid_list.begin();
while (iterator != raid_list.end()) {
for (auto& member : (*iterator)->members) {
for (auto &member : (*iterator)->members) {
if (member.member) {
if (member.member == client) {
client->p_raid_instance = *iterator;
@@ -2161,50 +2161,6 @@ Raid* EntityList::GetRaidByClient(Client* client)
return nullptr;
}
#ifdef BOTS
Raid* EntityList::GetRaidByBotName(const char* name)
{
std::list<Raid*>::iterator iterator;
iterator = raid_list.begin();
while (iterator != raid_list.end()) {
for (auto& member : (*iterator)->members) {
if (member.membername) {
if (strcmp(member.membername, name) == 0) {
//client->p_raid_instance = *iterator;
return *iterator;
}
}
}
++iterator;
}
return nullptr;
}
#endif
#ifdef BOTS
Raid* EntityList::GetRaidByBot(Bot* bot)
{
std::list<Raid*>::iterator iterator;
iterator = raid_list.begin();
while (iterator != raid_list.end()) {
for (auto& member : (*iterator)->members) {
if (member.member && member.member->CastToBot() == bot) {
bot->p_raid_instance = *iterator;
return *iterator;
}
}
++iterator;
}
return nullptr;
}
#endif
Raid *EntityList::GetRaidByMob(Mob *mob)
{