Index: arcemu-world/Unit.cpp
===================================================================
--- arcemu-world/Unit.cpp   (revision 4568)
+++ arcemu-world/Unit.cpp   (working copy)
@@ -2694,6 +2694,8 @@
        return;

    if( !IsPlayer() && IsVehicle() ){
+       if(m_interruptRegen)
+           return;
        uint32 powertype = GetPowerType();
        float wrate = sWorld.getRate( RATE_VEHICLES_POWER_REGEN );
        float amount = wrate * 20.0f;
@@ -6318,6 +6320,8 @@
 {
    if(!IsPlayer() || TO_PLAYER(this)->m_changingMaps)
    {
+       if(IsCreature())
+           SetByteFlag( UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_2 );
        WorldPacket data(SMSG_MOVE_SET_CAN_FLY, 13);
        data << GetNewGUID();
        data << uint32(2);
@@ -6339,6 +6343,8 @@
 {
    if(!IsPlayer() || TO_PLAYER(this)->m_changingMaps)
    {
+       if(IsCreature())
+           RemoveByteFlag( UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_2 );
        WorldPacket data(SMSG_MOVE_UNSET_CAN_FLY, 13);
        data << GetNewGUID();
        data << uint32(5);
Index: arcemu-world/Vehicle.cpp
===================================================================
--- arcemu-world/Vehicle.cpp    (revision 4568)
+++ arcemu-world/Vehicle.cpp    (working copy)
@@ -78,7 +78,8 @@
    case POWER_TYPE_PYRITE:
        owner->SetPowerType( POWER_TYPE_ENERGY );
        owner->SetMaxPower( POWER_TYPE_ENERGY, 50 );
-       owner->SetPower( POWER_TYPE_ENERGY, 50 );
+       owner->SetPower( POWER_TYPE_ENERGY, 0 );
+       owner->m_interruptRegen++; // Ulduar vehicles do not regen pyrite they gain it from pyrite containers.
        break;
    }

@@ -179,13 +180,6 @@

        if( c->GetScript() != NULL ){
            c->GetScript()->OnEnterVehicle();
-       }
-   }
-
-   if( owner->IsCreature() ){
-       Creature *c = static_cast< Creature* >( owner );
-
-       if( c->GetScript() != NULL ){
            if( passengercount == 1 )
                c->GetScript()->OnFirstPassengerEntered( passenger );

@@ -253,7 +247,8 @@
        static_cast< Player* >( passenger )->SetFarsightTarget( 0 );

    // if we are on a flying vehicle, add a parachute!
-   if( owner->HasAuraWithName( SPELL_AURA_ENABLE_FLIGHT ) || owner->HasAuraWithName( SPELL_AURA_ENABLE_FLIGHT2 ) )
+   if( owner->HasAuraWithName( SPELL_AURA_ENABLE_FLIGHT ) || owner->HasAuraWithName( SPELL_AURA_ENABLE_FLIGHT2 ) ||
+       owner->HasAuraWithName(SPELL_AURA_ENABLE_FLIGHT_WITH_UNMOUNTED_SPEED))
        passenger->CastSpell( passenger, 45472, false );

    // re-add spellclick flag if needed
Index: scripts/src/SpellHandlers/PetAISpells.cpp
===================================================================
--- scripts/src/SpellHandlers/PetAISpells.cpp   (revision 4568)
+++ scripts/src/SpellHandlers/PetAISpells.cpp   (working copy)
@@ -278,10 +278,6 @@
    FrostBroodVanquisherAI( Creature *c ) : CreatureAIScript( c ){
    }

-   void OnLoad(){
-       _unit->SetByte( UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNK_2 );
-   }
-
    void OnLastPassengerLeft( Unit *passenger ){
        if( _unit->GetSummonedByGUID() == passenger->GetGUID() )
            _unit->Despawn( 1 * 1000, 0 );