aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Pet.cpp3
-rw-r--r--src/game/SpellEffects.cpp14
2 files changed, 8 insertions, 9 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index dd201a7a064..5bb5be55908 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -981,11 +981,10 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
if (!pInfo)
SetCreateHealth(30*petlevel);
- float dmg_multiplier = 0.3f;
+ float dmg_multiplier = 0.3f;
if (HasAura(63271)) // Glyph of Feral Spirit
dmg_multiplier = 0.6f;
-
SetBonusDamage(int32(m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier));
SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE,float((petlevel * 4 - petlevel) + (m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * dmg_multiplier)));
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 30997ae50b7..86339274962 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3289,14 +3289,14 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
return;
- case GAMEOBJECT_TYPE_GOOBER:
- // goober_scripts can be triggered if the player don't have the quest
+ case GAMEOBJECT_TYPE_GOOBER:
+ // goober_scripts can be triggered if the player don't have the quest
if (gameObjTarget->GetGOInfo()->goober.eventId)
- {
- sLog.outDebug("Goober ScriptStart id %u for GO %u",gameObjTarget->GetGOInfo()->goober.eventId,gameObjTarget->GetDBTableGUIDLow());
- player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->goober.eventId, player, gameObjTarget);
- gameObjTarget->EventInform(gameObjTarget->GetGOInfo()->goober.eventId);
- }
+ {
+ sLog.outDebug("Goober ScriptStart id %u for GO %u",gameObjTarget->GetGOInfo()->goober.eventId,gameObjTarget->GetDBTableGUIDLow());
+ player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->goober.eventId, player, gameObjTarget);
+ gameObjTarget->EventInform(gameObjTarget->GetGOInfo()->goober.eventId);
+ }
gameObjTarget->Use(m_caster);
return;