Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp

3 files changed, 8 insertions, 54 deletions

diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h
index a43edb4fcd7..f47b71cd48e 100644
--- a/src/server/scripts/Northrend/Gundrak/gundrak.h
+++ b/src/server/scripts/Northrend/Gundrak/gundrak.h
@@ -51,7 +51,8 @@ enum mainCreatures
     CREATURE_ECK                        = 29932
 };
 
-enum Gameobjects {
+enum Gameobjects
+{
 
     GO_SLADRAN_ALTAR                    = 192518,
     GO_MOORABI_ALTAR                    = 192519,
@@ -67,7 +68,6 @@ enum Gameobjects {
     GO_GALDARAH_DOOR3                   = 192568,
     GO_BRIDGE                           = 193188,
     GO_COLLISION                        = 192633
-    
 };
 
 #endif
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index 147d5eb1370..b1091013270 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -820,7 +820,6 @@ public:
         void Reset()
         {
            WithRedDragonBlood = false;
-           HarpoonerGUID = 0;
         }
 
         void EnterCombat(Unit* who)
@@ -879,6 +878,12 @@ public:
                 }
             }
 
+            if ((me->getFaction() == 35) && (!me->HasAura(SPELL_SUBDUED)))
+            {
+                HarpoonerGUID = 0;
+                me->DisappearAndDie();
+            }
+
             if (!UpdateVictim())
                 return;
 
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 65d69e368b8..268e904e292 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -276,56 +276,6 @@ public:
 };
 
 /*######
-## npc_mcgoyver
-######*/
-
-#define GOSSIP_ITEM_MG_I  "Walt sent me to pick up some dark iron ingots."
-#define GOSSIP_ITEM_MG_II "Yarp."
-
-enum eMcGoyver
-{
-    QUEST_WE_CAN_REBUILD_IT             = 11483,
-
-    SPELL_CREATURE_DARK_IRON_INGOTS     = 44512,
-    SPELL_TAXI_EXPLORERS_LEAGUE         = 44280,
-
-    GOSSIP_TEXTID_MCGOYVER              = 12193
-};
-
-class npc_mcgoyver : public CreatureScript
-{
-public:
-    npc_mcgoyver() : CreatureScript("npc_mcgoyver") { }
-
-    bool OnGossipHello(Player* player, Creature* creature)
-    {
-        if (player->GetQuestStatus(QUEST_WE_CAN_REBUILD_IT) == QUEST_STATUS_INCOMPLETE)
-            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_I, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-
-        player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
-        return true;
-    }
-
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
-    {
-        player->PlayerTalkClass->ClearMenus();
-        switch (action)
-        {
-            case GOSSIP_ACTION_INFO_DEF+1:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_MG_II, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-                player->SEND_GOSSIP_MENU(GOSSIP_TEXTID_MCGOYVER, creature->GetGUID());
-                player->CastSpell(player, SPELL_CREATURE_DARK_IRON_INGOTS, true);
-                break;
-            case GOSSIP_ACTION_INFO_DEF+2:
-                player->CastSpell(player, SPELL_TAXI_EXPLORERS_LEAGUE, true);
-                player->CLOSE_GOSSIP_MENU();
-                break;
-        }
-        return true;
-    }
-};
-
-/*######
 ## npc_daegarn
 ######*/
 
@@ -435,6 +385,5 @@ void AddSC_howling_fjord()
     new npc_apothecary_hanes;
     new npc_plaguehound_tracker;
     new npc_razael_and_lyana;
-    new npc_mcgoyver;
     new npc_daegarn;
  }