Merge branch 'master' of https://github.com/TrinityCore/TrinityCore

8 files changed, 39 insertions, 39 deletions

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index fe0ecf26c96..a6938122196 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -232,13 +232,13 @@ class spell_gen_pet_summoned : public SpellScriptLoader
                 if (caster->GetTypeId() != TYPEID_PLAYER)
                     return;
 
-                Player* plr = caster->ToPlayer();
-                if (plr->GetLastPetNumber())
+                Player* player = caster->ToPlayer();
+                if (player->GetLastPetNumber())
                 {
-                    PetType newPetType = (plr->getClass() == CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET;
-                    if (Pet* newPet = new Pet(plr, newPetType))
+                    PetType newPetType = (player->getClass() == CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET;
+                    if (Pet* newPet = new Pet(player, newPetType))
                     {
-                        if (newPet->LoadPetFromDB(plr, 0, plr->GetLastPetNumber(), true))
+                        if (newPet->LoadPetFromDB(player, 0, player->GetLastPetNumber(), true))
                         {
                             // revive the pet if it is dead
                             if (newPet->getDeathState() == DEAD)
@@ -647,7 +647,7 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
-                if (Player *caster = GetCaster()->ToPlayer())
+                if (Player* caster = GetCaster()->ToPlayer())
                     if (caster->HasSpellCooldown(SPELL_DIVINE_STORM))
                         caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true);
             }
@@ -896,9 +896,9 @@ class spell_generic_clone_weapon : public SpellScriptLoader
                     case SPELL_COPY_WEAPON_2:
                     case SPELL_COPY_WEAPON_3:
                     {
-                        if (Player* plrCaster = caster->ToPlayer())
+                        if (Player* player = caster->ToPlayer())
                         {
-                            if (Item* mainItem = plrCaster->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
+                            if (Item* mainItem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND))
                                 target->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, mainItem->GetEntry());
                         }
                         else
@@ -908,9 +908,9 @@ class spell_generic_clone_weapon : public SpellScriptLoader
                     case SPELL_COPY_OFFHAND:
                     case SPELL_COPY_OFFHAND_2:
                     {
-                        if (Player* plrCaster = caster->ToPlayer())
+                        if (Player* player = caster->ToPlayer())
                         {
-                            if (Item* offItem = plrCaster->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
+                            if (Item* offItem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
                                 target->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 1, offItem->GetEntry());
                         }
                         else
@@ -919,9 +919,9 @@ class spell_generic_clone_weapon : public SpellScriptLoader
                     }
                     case SPELL_COPY_RANGED:
                     {
-                        if (Player* plrCaster = caster->ToPlayer())
+                        if (Player* player = caster->ToPlayer())
                         {
-                            if (Item* rangedItem = plrCaster->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED))
+                            if (Item* rangedItem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED))
                                 target->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + 2, rangedItem->GetEntry());
                         }
                         else
@@ -1217,7 +1217,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader
 {
     public:
         spell_gen_vehicle_scaling() : SpellScriptLoader("spell_gen_vehicle_scaling") { }
-        
+
         class spell_gen_vehicle_scaling_AuraScript : public AuraScript
         {
             PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript);
@@ -1230,7 +1230,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader
 
                 float factor;
                 uint16 baseItemLevel;
-                        
+
                 // TODO: Reserach coeffs for different vehicles
                 switch (GetId())
                 {
@@ -1243,14 +1243,14 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader
                         baseItemLevel = 170;
                         break;
                 }
-                        
+
                 float avgILvl = caster->ToPlayer()->GetAverageItemLevel();
                 if (avgILvl < baseItemLevel)
                     return;                     // TODO: Research possibility of scaling down
-                        
+
                 amount = uint16((avgILvl - baseItemLevel) * factor);
             }
-                
+
             void Register()
             {
                 DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT);
@@ -1258,7 +1258,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader
                 DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT);
             }
         };
- 
+
         AuraScript* GetAuraScript() const
         {
             return new spell_gen_vehicle_scaling_AuraScript();
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index d809df9f449..acf96f4e0a7 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -189,7 +189,7 @@ public:
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
-            Unit *caster = GetCaster();
+            Unit* caster = GetCaster();
             int32 healthModSpellBasePoints0 = int32(caster->CountPctFromMaxHealth(30));
             caster->CastCustomSpell(caster, HUNTER_PET_SPELL_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL);
         }
@@ -265,7 +265,7 @@ public:
         PrepareSpellScript(spell_hun_readiness_SpellScript)
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
-            Unit *caster = GetCaster();
+            Unit* caster = GetCaster();
             if (caster->GetTypeId() != TYPEID_PLAYER)
                 return;
 
@@ -423,8 +423,8 @@ public:
 
         void HandleScript(SpellEffIndex /*effIndex*/)
         {
-            Unit *caster = GetCaster();
-            Unit *owner = caster->GetOwner();
+            Unit* caster = GetCaster();
+            Unit* owner = caster->GetOwner();
             if (!owner || caster->HasAura(HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF))
                 return;
             owner->CastCustomSpell(HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED, SPELLVALUE_BASE_POINT0, 100, caster, true);
@@ -470,7 +470,7 @@ public:
         {
             if (!GetHitUnit())
                 return;
-            Unit *caster = GetCaster();
+            Unit* caster = GetCaster();
             caster->CastSpell(caster, HUNTER_PET_SPELL_CARRION_FEEDER_TRIGGERED, false);
         }
 
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 95ed91f5a77..32dca054d43 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -81,7 +81,7 @@ class spell_mage_cold_snap : public SpellScriptLoader
             PrepareSpellScript(spell_mage_cold_snap_SpellScript)
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                Unit *caster = GetCaster();
+                Unit* caster = GetCaster();
 
                 if (caster->GetTypeId() != TYPEID_PLAYER)
                     return;
@@ -137,7 +137,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                if (Unit *unitTarget = GetHitUnit())
+                if (Unit* unitTarget = GetHitUnit())
                     if (unitTarget->GetTypeId() == TYPEID_UNIT)
                         unitTarget->CastSpell(unitTarget, spell_list[urand(0, 5)], true);
             }
@@ -186,7 +186,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                if (Unit *unitTarget = GetHitUnit())
+                if (Unit* unitTarget = GetHitUnit())
                 {
                     // Glyph of Eternal Water
                     if (unitTarget->HasAura(SPELL_MAGE_GLYPH_OF_ETERNAL_WATER))
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 5902bc04885..031a7da97f2 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -138,7 +138,7 @@ public:
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
-            if (Unit *unitTarget = GetHitUnit())
+            if (Unit* unitTarget = GetHitUnit())
             {
                 uint32 spell_id = 0;
                 switch(unitTarget->getClass())
@@ -273,9 +273,9 @@ public:
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
-            if (Unit *unitTarget = GetHitUnit())
+            if (Unit* unitTarget = GetHitUnit())
             {
-                Unit *caster = GetCaster();
+                Unit* caster = GetCaster();
 
                 uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
 
@@ -309,7 +309,7 @@ public:
         PrepareSpellScript(spell_pal_judgement_of_command_SpellScript)
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
-            if (Unit *unitTarget = GetHitUnit())
+            if (Unit* unitTarget = GetHitUnit())
                 if (SpellEntry const* spell_proto = sSpellStore.LookupEntry(GetEffectValue()))
                     GetCaster()->CastSpell(unitTarget, spell_proto, true, NULL);
         }
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index d4b6c293af7..2d35ed41bf0 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -158,7 +158,7 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader
             void HandleEffectScriptEffect(SpellEffIndex /*effIndex*/)
             {
                 // Refresh Shadow Word: Pain on target
-                if (Unit *unitTarget = GetHitUnit())
+                if (Unit* unitTarget = GetHitUnit())
                     if (AuraEffect* aur = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_PRIEST, 0x8000, 0, 0, GetCaster()->GetGUID()))
                         aur->GetBase()->RefreshDuration();
             }
@@ -203,11 +203,11 @@ class spell_pri_penance : public SpellScriptLoader
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                Unit *unitTarget = GetHitUnit();
+                Unit* unitTarget = GetHitUnit();
                 if (!unitTarget || !unitTarget->isAlive())
                     return;
 
-                Unit *caster = GetCaster();
+                Unit* caster = GetCaster();
 
                 uint8 rank = sSpellMgr->GetSpellRank(GetSpellInfo()->Id);
 
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 2d926118ed2..8a782e4ca2b 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -435,7 +435,7 @@ public:
 
         void HandleDummy(SpellEffIndex /*effIndex*/)
         {
-            Item *castItem = GetCastItem();
+            Item* castItem = GetCastItem();
             if (!castItem)
                 return;
 
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index 4e0f7d47674..4c2bdbfa4de 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -162,7 +162,7 @@ class spell_rog_preparation : public SpellScriptLoader
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                Unit *caster = GetCaster();
+                Unit* caster = GetCaster();
                 if (caster->GetTypeId() != TYPEID_PLAYER)
                     return;
 
@@ -269,11 +269,11 @@ class spell_rog_shiv : public SpellScriptLoader
 
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
-                Unit *caster = GetCaster();
+                Unit* caster = GetCaster();
                 if (caster->GetTypeId() != TYPEID_PLAYER)
                     return;
 
-                if (Unit *unitTarget = GetHitUnit())
+                if (Unit* unitTarget = GetHitUnit())
                     caster->CastSpell(unitTarget, ROGUE_SPELL_SHIV_TRIGGERED, true);
             }
 
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 2c84f7b97aa..8f81bb88fb2 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -166,7 +166,7 @@ public:
                 {
                     int32 effValue = GetEffectValue();
                     // Glyph of Mana Tide
-                    if (Unit *owner = caster->GetOwner())
+                    if (Unit* owner = caster->GetOwner())
                         if (AuraEffect *dummy = owner->GetAuraEffect(SHAMAN_SPELL_GLYPH_OF_MANA_TIDE, 0))
                             effValue += dummy->GetAmount();
                     // Regenerate 6% of Total Mana Every 3 secs
@@ -210,7 +210,7 @@ public:
         void HandleEffectPeriodic(AuraEffect const* aurEff)
         {
             Unit* target = GetTarget();
-            if (Unit *caster = aurEff->GetBase()->GetCaster())
+            if (Unit* caster = aurEff->GetBase()->GetCaster())
                 if (AuraEffect* aur = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, 2289, 0))
                     if (roll_chance_i(aur->GetBaseAmount()))
                         target->CastSpell(target, SHAMAN_TOTEM_SPELL_EARTHEN_POWER, true, NULL, aurEff);