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
@@ -1073,11 +1073,11 @@ namespace Game.AI
                                Creature target = obj.ToCreature();
                                if (target.IsAlive() && IsSmart(target))
                                {
-                                    ((SmartAI)target.GetAI()).SetDespawnTime(e.Action.forceDespawn.delay + 1); // Next tick
+                                    ((SmartAI)target.GetAI()).SetDespawnTime(e.Action.forceDespawn.delay + 1, e.Action.forceDespawn.respawn); // Next tick
                                    ((SmartAI)target.GetAI()).StartDespawn();
                                }
                                else
-                                    target.DespawnOrUnsummon(e.Action.forceDespawn.delay);
+                                    target.DespawnOrUnsummon(e.Action.forceDespawn.delay, TimeSpan.FromSeconds(e.Action.forceDespawn.respawn));
                            }
                            else if (obj.IsTypeId(TypeId.GameObject))
                            {