Core/Players: Changed flight masters to suppress positive transforms/shapeshifts instead of preventing starting flight

2018-07-25 12:17:32 -04:00
parent d42dba9ac1
commit 75619e833f
5 changed files with 37 additions and 17 deletions
@@ -6694,13 +6694,12 @@ namespace Game.Entities
            if (npc != null)
            {
                // not let cheating with start flight mounted
-                if (IsMounted())
-                {
-                    GetSession().SendActivateTaxiReply(ActivateTaxiReply.PlayerAlreadyMounted);
-                    return false;
-                }
+                RemoveAurasByType(AuraType.Mounted);

-                if (IsInDisallowedMountForm())
+                if (GetDisplayId() != GetNativeDisplayId())
+                    RestoreDisplayId(true);
+
+                if (IsDisallowedMountForm(getTransForm(), FORM_NONE, GetDisplayId()))
                {
                    GetSession().SendActivateTaxiReply(ActivateTaxiReply.PlayerShapeshifted);
                    return false;
@@ -6718,8 +6717,8 @@ namespace Game.Entities
            {
                RemoveAurasByType(AuraType.Mounted);

-                if (IsInDisallowedMountForm())
-                    RemoveAurasByType(AuraType.ModShapeshift);
+                if (GetDisplayId() != GetNativeDisplayId())
+                    RestoreDisplayId(true);

                Spell spell = GetCurrentSpell(CurrentSpellTypes.Generic);
                if (spell != null)