Merge branch 'master' into Playerbot

src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp

@@ -1790,7 +1790,7 @@ public:
             if (!spellClickHandled)
                 return;
 
-            if (!me->GetUInt32Value(UNIT_NPC_FLAGS))
+            if (!me->GetNpcFlags())
                 return;
 
             switch (me->GetArmor())
@@ -1806,7 +1806,7 @@ public:
                     break;
             }
 
-            me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
+            me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
             me->DespawnOrUnsummon(1000);
         }
 

src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp

@@ -546,7 +546,7 @@ struct npc_salvaged_siege_engine : public VehicleAI
             {
                 if (Unit* turret = vehicle->GetPassenger(7))
                 {
-                    if (Vehicle* turretVehicle = me->GetVehicleKit())
+                    if (Vehicle* turretVehicle = turret->GetVehicleKit())
                     {
                         if (!turretVehicle->IsVehicleInUse())
                         {