Core/Spells: Fixed bad Z coordinate for Spell::EffectBind with location stored in database

Core/Scripts: Corrected few mistakes in misc scripts

--HG--
branch : trunk

2 files changed, 10 insertions, 10 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 938e4fe8e6f..875bc94d3e3 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -530,22 +530,22 @@ class mob_essence_of_twin : public CreatureScript
 public:
     mob_essence_of_twin() : CreatureScript("mob_essence_of_twin") { }
 
-    bool OnGossipHello(Player* pPlayer, Creature* pCreature)
+    bool OnGossipHello(Player* player, Creature* creature)
     {
-        switch(pCreature->GetEntry())
+        switch (creature->GetEntry())
         {
             case NPC_LIGHT_ESSENCE:
-                if (pPlayer || pPlayer->HasAura(SPELL_DARK_ESSENCE))
-                    pPlayer->RemoveAura(SPELL_DARK_ESSENCE);
-                pPlayer->CastSpell(pPlayer,SPELL_LIGHT_ESSENCE,true);
+                player->RemoveAura(SPELL_DARK_ESSENCE);
+                player->CastSpell(player, SPELL_LIGHT_ESSENCE, true);
                 break;
             case NPC_DARK_ESSENCE:
-                if (pPlayer || pPlayer->HasAura(SPELL_LIGHT_ESSENCE))
-                    pPlayer->RemoveAura(SPELL_LIGHT_ESSENCE);
-                pPlayer->CastSpell(pPlayer,SPELL_DARK_ESSENCE,true);
+                player->RemoveAura(SPELL_LIGHT_ESSENCE);
+                player->CastSpell(player, SPELL_DARK_ESSENCE, true);
+                break;
+            default:
                 break;
         }
-        pPlayer->CLOSE_GOSSIP_MENU();
+        player->CLOSE_GOSSIP_MENU();
         return true;
     }
 };
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 3b78ce16ec4..21e23a9c9e4 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -90,7 +90,7 @@ public:
             uiYoggSaronGUID       = 0;
             uiAlgalonGUID         = 0;
             uiKologarnChestGUID   = 0;
-            uiKologarnChestGUID   = 0;
+            uiThorimChestGUID     = 0;
             uiHodirChestGUID      = 0;
             uiFreyaChestGUID      = 0;
             uiLeviathanGateGUID   = 0;