sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Core/Misc): rename some variables that can be confusing (#10592)

Browse Source
This commit is contained in:
Kitzunu
2022-02-14 20:06:59 +01:00
committed by GitHub
parent 455899dc75
commit 665919d010
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/ConditionMgr.cpp
+2 -2
View File
@@ -1929,8 +1929,8 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
} }
case CONDITION_MAPID: case CONDITION_MAPID:
{ {
MapEntry const* me = sMapStore.LookupEntry(cond->ConditionValue1); MapEntry const* mapId = sMapStore.LookupEntry(cond->ConditionValue1);
if (!me) if (!mapId)
{ {
LOG_ERROR("sql.sql", "Map condition has non existing map ({}), skipped", cond->ConditionValue1); LOG_ERROR("sql.sql", "Map condition has non existing map ({}), skipped", cond->ConditionValue1);
return false; return false;
src/server/game/Entities/Unit/Unit.cpp
+8 -8
View File
@@ -12975,11 +12975,11 @@ void Unit::CombatStart(Unit* victim, bool initialAggro)
if (who->GetTypeId() == TYPEID_PLAYER) if (who->GetTypeId() == TYPEID_PLAYER)
SetContestedPvP(who->ToPlayer()); SetContestedPvP(who->ToPlayer());
Player* me = GetCharmerOrOwnerPlayerOrPlayerItself(); Player* player = GetCharmerOrOwnerPlayerOrPlayerItself();
if (me && who->IsPvP() && (who->GetTypeId() != TYPEID_PLAYER || !me->duel || me->duel->Opponent != who)) if (player && who->IsPvP() && (who->GetTypeId() != TYPEID_PLAYER || !player->duel || player->duel->Opponent != who))
{ {
me->UpdatePvP(true); player->UpdatePvP(true);
me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT); player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
} }
} }
@@ -13002,11 +13002,11 @@ void Unit::CombatStartOnCast(Unit* target, bool initialAggro, uint32 duration)
if (who->GetTypeId() == TYPEID_PLAYER) if (who->GetTypeId() == TYPEID_PLAYER)
SetContestedPvP(who->ToPlayer()); SetContestedPvP(who->ToPlayer());
Player* me = GetCharmerOrOwnerPlayerOrPlayerItself(); Player* player = GetCharmerOrOwnerPlayerOrPlayerItself();
if (me && who->IsPvP() && (who->GetTypeId() != TYPEID_PLAYER || !me->duel || me->duel->Opponent != who)) if (player && who->IsPvP() && (who->GetTypeId() != TYPEID_PLAYER || !player->duel || player->duel->Opponent != who))
{ {
me->UpdatePvP(true); player->UpdatePvP(true);
me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT); player->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
} }
} }
src/server/scripts/Commands/cs_npc.cpp
+7 -7
View File
@@ -477,13 +477,13 @@ public:
//set tempfaction for creature //set tempfaction for creature
static bool HandleNpcSetFactionTempIdCommand(ChatHandler* handler, uint32 tempfaction) static bool HandleNpcSetFactionTempIdCommand(ChatHandler* handler, uint32 tempfaction)
{ {
Player* me = handler->GetSession()->GetPlayer(); Player* player = handler->GetSession()->GetPlayer();
Unit* SelectedCreature = me->GetSelectedUnit(); Unit* unit = player->GetSelectedUnit();
if (!SelectedCreature) if (!unit)
return false; return false;
Creature* creature = SelectedCreature->ToCreature(); Creature* creature = unit->ToCreature();
if (!creature) if (!creature)
return false; return false;
@@ -496,12 +496,12 @@ public:
//set orginal faction for npc //set orginal faction for npc
static bool HandleNpcSetOriginalFaction(ChatHandler* handler) static bool HandleNpcSetOriginalFaction(ChatHandler* handler)
{ {
Player* me = handler->GetSession()->GetPlayer(); Player* player = handler->GetSession()->GetPlayer();
if (!me) if (!player)
return false; return false;
Creature* creature = me->GetSelectedUnit()->ToCreature(); Creature* creature = player->GetSelectedUnit()->ToCreature();
if (!creature) if (!creature)
return false; return false;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+8 -8
View File
@@ -895,15 +895,15 @@ public:
{ {
if (Unit* target = GetTarget()) if (Unit* target = GetTarget())
if (target->GetDisplayId() != 11686) if (target->GetDisplayId() != 11686)
if (Creature* me = target->ToCreature()) if (Creature* creature = target->ToCreature())
if (Player* p = me->SelectNearestPlayer(2.75f)) if (Player* player = creature->SelectNearestPlayer(2.75f))
if (me->GetExactDist2d(p) <= 2.75f) if (creature->GetExactDist2d(player) <= 2.75f)
{ {
me->AI()->DoAction(1); // despawning = true; creature->AI()->DoAction(1); // despawning = true;
me->GetMotionMaster()->MoveIdle(); creature->GetMotionMaster()->MoveIdle();
me->CastSpell((Unit*)nullptr, me->GetEntry() == NPC_CONCENTRATED_LIGHT ? SPELL_UNLEASHED_LIGHT : SPELL_UNLEASHED_DARK, false); creature->CastSpell((Unit*)nullptr, creature->GetEntry() == NPC_CONCENTRATED_LIGHT ? SPELL_UNLEASHED_LIGHT : SPELL_UNLEASHED_DARK, false);
me->SetDisplayId(11686); creature->SetDisplayId(11686);
me->DespawnOrUnsummon(1500); creature->DespawnOrUnsummon(1500);
} }
} }