pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-03 19:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Kinglykrab 2020-01-20 21:14:28 -05:00
parent caceae1028
commit 8b37ef5e67
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/questmgr.cpp
View File

@ -1911,17 +1911,17 @@ bool QuestManager::summonallplayercorpses(uint32 char_id, const glm::vec4& posit
} }
int QuestManager::getplayercorpsecount(uint32 char_id) { int QuestManager::getplayercorpsecount(uint32 char_id) {
if (char_id > 0) if (char_id > 0) {
return database.CountCharacterCorpses(char_id); return database.CountCharacterCorpses(char_id);
}
return 0; return 0;
} }
int QuestManager::getplayercorpsecountbyzoneid(uint32 char_id, uint32 zone_id) { int QuestManager::getplayercorpsecountbyzoneid(uint32 char_id, uint32 zone_id) {
if (char_id > 0 && zone_id > 0) if (char_id > 0 && zone_id > 0) {
return database.CountCharacterCorpsesByZoneID(char_id, zone_id); return database.CountCharacterCorpsesByZoneID(char_id, zone_id);
}
return 0; return 0;
} }

16
zone/spell_effects.cpp
View File

@ -1824,34 +1824,34 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
{ {
if (IsClient()) { if (IsClient()) {
Client* client_target = this->CastToClient(); Client* client_target = this->CastToClient();
if(client_target->IsGrouped()) { if (client_target->IsGrouped()) {
Group* group = client_target->GetGroup(); Group* group = client_target->GetGroup();
if(!group->IsGroupMember(caster)) { if (!group->IsGroupMember(caster)) {
if (caster != this) { if (caster != this) {
caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE); caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE);
break; break;
} }
} }
} else if (caster) { } else if (caster) {
if(caster->IsRaidGrouped()) { if (caster->IsRaidGrouped()) {
Raid *raid = caster->GetRaid(); Raid *raid = caster->GetRaid();
uint32 group_id = raid->GetGroup(caster->GetName()); uint32 group_id = raid->GetGroup(caster->GetName());
if(group_id > 0 && group_id < MAX_RAID_GROUPS) { if (group_id > 0 && group_id < MAX_RAID_GROUPS) {
if(raid->GetGroup(client_target->GetName()) != group_id) { if (raid->GetGroup(client_target->GetName()) != group_id) {
caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE); caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE);
break; break;
} }
} }
} else { } else {
if(caster != this) { if (caster != this) {
caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE); caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE);
break; break;
} }
} }
} }
if(client_target) { if (client_target) {
if(database.CountCharacterCorpses(client_target->CharacterID()) == 0) { if (database.CountCharacterCorpses(client_target->CharacterID()) == 0) {
if (caster == this) { if (caster == this) {
Message(Chat::Yellow, "You have no corpses to summon."); Message(Chat::Yellow, "You have no corpses to summon.");
} else { } else {