Merge remote-tracking branch 'origin/master' into SmartSpell

2017-07-24 14:06:50 -04:00
parent c41f76d27e 0d8729ae32
commit 7a405bb18b
18 changed files with 56 additions and 77 deletions
@@ -95,7 +95,7 @@ namespace Game.AI
                    mDespawnState++;
                }
                else
-                    me.DespawnOrUnsummon();
+                    me.DespawnOrUnsummon(0, TimeSpan.FromSeconds(mRespawnTime));
            }
            else
                mDespawnTime -= diff;
@@ -549,6 +549,7 @@ namespace Game.AI
        public override void JustRespawned()
        {
            mDespawnTime = 0;
+            mRespawnTime = 0;
            mDespawnState = 0;
            mEscortState = SmartEscortState.None;
            me.SetVisible(true);
@@ -907,9 +908,10 @@ namespace Game.AI

        public void SetInvincibilityHpLevel(uint level) { mInvincibilityHpLevel = level; }

-        public void SetDespawnTime(uint t)
+        public void SetDespawnTime(uint t, uint r = 0)
        {
            mDespawnTime = t;
+            mRespawnTime = r;
            mDespawnState = (uint)(t != 0 ? 1 : 0);
        }

@@ -945,6 +947,7 @@ namespace Game.AI
        uint mInvincibilityHpLevel;

        uint mDespawnTime;
+        uint mRespawnTime;
        uint mDespawnState;

        public uint mEscortQuestID;