diff options
7 files changed, 10 insertions, 10 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp index 86d10cbb625..e8bbd7139f1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp @@ -234,7 +234,7 @@ public:                      case 11:                          if (Creature* gyth = me->FindNearestCreature(NPC_GYTH, 10.0f, true))                              gyth->AI()->SetData(1, 1); -                        me->DespawnOrUnsummon(1000, 24h * 7); +                        me->DespawnOrUnsummon(1s, 7_days);                          break;                  }              } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index b3093e6572e..fd8e1b493e3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -97,12 +97,12 @@ public:                  case NPC_PYROGAURD_EMBERSEER:                      PyroguardEmberseer = creature->GetGUID();                      if (GetBossState(DATA_PYROGAURD_EMBERSEER) == DONE) -                        creature->DespawnOrUnsummon(0, 24h * 7); +                        creature->DespawnOrUnsummon(0s, 7_days);                      break;                  case NPC_WARCHIEF_REND_BLACKHAND:                      WarchiefRendBlackhand = creature->GetGUID();                      if (GetBossState(DATA_GYTH) == DONE) -                        creature->DespawnOrUnsummon(0, 24h * 7); +                        creature->DespawnOrUnsummon(0s, 7_days);                      break;                  case NPC_GYTH:                      Gyth = creature->GetGUID(); @@ -116,7 +116,7 @@ public:                  case NPC_LORD_VICTOR_NEFARIUS:                      LordVictorNefarius = creature->GetGUID();                      if (GetBossState(DATA_GYTH) == DONE) -                        creature->DespawnOrUnsummon(0, 24h * 7); +                        creature->DespawnOrUnsummon(0s, 7_days);                      break;                  case NPC_SCARSHIELD_INFILTRATOR:                      ScarshieldInfiltrator = creature->GetGUID(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 922f6a61d95..8e7ab96a7fe 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -285,7 +285,7 @@ public:                              break;                          case EVENT_SUCCESS_2:                              DoCast(me, SPELL_VAELASTRASZZ_SPAWN); -                            me->DespawnOrUnsummon(1000); +                            me->DespawnOrUnsummon(1s);                              break;                          case EVENT_PATH_3:                              me->GetMotionMaster()->MovePath(NEFARIUS_PATH_3, false); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index eab3813893a..a98342d0d78 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -121,7 +121,7 @@ class boss_kirtonos_the_herald : public CreatureScript                      brazier->ResetDoorOrButton();                      brazier->SetGoState(GO_STATE_READY);                  } -                me->DespawnOrUnsummon(5000); +                me->DespawnOrUnsummon(5s);              }              void IsSummonedBy(WorldObject* /*summoner*/) override diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 64529c8fd0a..e037f50aa74 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -656,7 +656,7 @@ class spell_dark_fiend_skin : public SpellScriptLoader                      target->AttackStop();                      target->StopMoving();                      target->CastSpell(target, SPELL_DARKFIEND_VISUAL, true); -                    target->DespawnOrUnsummon(3000); +                    target->DespawnOrUnsummon(3s);                  }              } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 88f2ad60df8..db648c6876c 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -165,7 +165,7 @@ class boss_arlokk : public CreatureScript                  BossAI::EnterEvadeMode(why);                  if (GameObject* object = instance->GetGameObject(DATA_GONG_BETHEKK))                      object->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); -                me->DespawnOrUnsummon(4000); +                me->DespawnOrUnsummon(4s);              }              void SetData(uint32 id, uint32 /*value*/) override @@ -392,7 +392,7 @@ class npc_zulian_prowler : public CreatureScript                      if (arlokk->IsAlive())                          arlokk->GetAI()->SetData(_sideData, 0);                  } -                me->DespawnOrUnsummon(4000); +                me->DespawnOrUnsummon(4s);              }              void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index b8769fed8b1..2633c2f2f8b 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -371,7 +371,7 @@ struct npc_thalorien_dawnseeker : public ScriptedAI                      if (Creature* thalorien = ObjectAccessor::GetCreature(*me, _thalorienGUID))                      {                          thalorien->SetStandState(UNIT_STAND_STATE_KNEEL); -                        thalorien->DespawnOrUnsummon(5 * IN_MILLISECONDS); +                        thalorien->DespawnOrUnsummon(5s);                      }                      me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);  | 
