From 2af1ddc5ea2275e42c2ee6ba750a28e3a0919ae3 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 27 Jun 2018 17:03:35 -0400 Subject: [PATCH] Core/Scripts: Remove some unused GetAI methods --- Source/Game/Scripting/CoreScripts.cs | 10 ---------- .../EasternKingdoms/Karazhan/InstanceKarazhan.cs | 5 ----- Source/Scripts/EasternKingdoms/Karazhan/OperaEvent.cs | 2 +- .../TrialOfTheChampion/InstanceTrialOfTheChampion.cs | 5 ----- .../TrialOfTheChampion/TrialOfTheChampion.cs | 2 +- .../TrialOfTheCrusader/TrialOfTheCrusader.cs | 8 +------- .../IcecrownCitadel/IcecrownCitadelTeleport.cs | 2 +- .../IcecrownCitadel/InstanceIcecrownCitadel.cs | 5 ----- Source/Scripts/Northrend/Ulduar/UlduarInstance.cs | 5 ----- 9 files changed, 4 insertions(+), 40 deletions(-) diff --git a/Source/Game/Scripting/CoreScripts.cs b/Source/Game/Scripting/CoreScripts.cs index 940b16c0d..ff69a4131 100644 --- a/Source/Game/Scripting/CoreScripts.cs +++ b/Source/Game/Scripting/CoreScripts.cs @@ -45,16 +45,6 @@ namespace Game.Scripting // whether or not this script type must be assigned in the database. public virtual bool IsDatabaseBound() { return false; } - public static T GetInstanceAI(WorldObject obj, string scriptName) where T : class - { - InstanceMap instance = obj.GetMap().ToInstanceMap(); - if (instance != null && instance.GetInstanceScript() != null) - if (instance.GetScriptName() == scriptName) - return (T)Activator.CreateInstance(typeof(T), obj); - - return null; - } - public static T GetInstanceAI(WorldObject obj) where T : class { InstanceMap instance = obj.GetMap().ToInstanceMap(); diff --git a/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs b/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs index 5fe535b76..164d86a8a 100644 --- a/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs +++ b/Source/Scripts/EasternKingdoms/Karazhan/InstanceKarazhan.cs @@ -459,10 +459,5 @@ namespace Scripts.EasternKingdoms.Karazhan { return new instance_karazhan_InstanceMapScript(map); } - - public static T GetKarazhanAI(Creature creature) where T : CreatureAI - { - return GetInstanceAI(creature, "instance_karazhan"); - } } } diff --git a/Source/Scripts/EasternKingdoms/Karazhan/OperaEvent.cs b/Source/Scripts/EasternKingdoms/Karazhan/OperaEvent.cs index 297a06ffa..aab7344b3 100644 --- a/Source/Scripts/EasternKingdoms/Karazhan/OperaEvent.cs +++ b/Source/Scripts/EasternKingdoms/Karazhan/OperaEvent.cs @@ -1684,7 +1684,7 @@ namespace Scripts.EasternKingdoms.Karazhan.OperaEvent public override CreatureAI GetAI(Creature creature) { - return instance_karazhan.GetKarazhanAI(creature); + return GetInstanceAI(creature); } } } diff --git a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs index 381c7bc6e..d05d4c205 100644 --- a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs +++ b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/InstanceTrialOfTheChampion.cs @@ -331,10 +331,5 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion { return new instance_trial_of_the_champion_InstanceMapScript(map); } - - public static T GetTrialOfTheChampionAI(Creature creature) where T : CreatureAI - { - return GetInstanceAI(creature, "instance_trial_of_the_champion"); - } } } diff --git a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cs b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cs index c6f3da5d5..e89b08497 100644 --- a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cs +++ b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/TrialOfTheChampion.cs @@ -582,7 +582,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheChampion public override CreatureAI GetAI(Creature creature) { - return instance_trial_of_the_champion.GetTrialOfTheChampionAI(creature); + return GetInstanceAI(creature); } } } diff --git a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs index 99dbc8cea..45bd27170 100644 --- a/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs +++ b/Source/Scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/TrialOfTheCrusader.cs @@ -770,12 +770,6 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader { return new instance_trial_of_the_crusader_InstanceMapScript(map); } - - public static T GetTrialOfTheCrusaderAI(Creature creature) where T : CreatureAI - { - return GetInstanceAI(creature, "instance_trial_of_the_crusader"); - } - } [Script] @@ -899,7 +893,7 @@ namespace Scripts.Northrend.CrusadersColiseum.TrialOfTheCrusader public override CreatureAI GetAI(Creature creature) { - return instance_trial_of_the_crusader.GetTrialOfTheCrusaderAI(creature); + return GetInstanceAI(creature); } } diff --git a/Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadelTeleport.cs b/Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadelTeleport.cs index 5eb1660cc..ee37f1421 100644 --- a/Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadelTeleport.cs +++ b/Source/Scripts/Northrend/IcecrownCitadel/IcecrownCitadelTeleport.cs @@ -58,7 +58,7 @@ namespace Scripts.Northrend.IcecrownCitadel public override GameObjectAI GetAI(GameObject go) { - return GetInstanceAI(go, "instance_icecrown_citadel"); + return GetInstanceAI(go); } public const uint GOSSIP_SENDER_ICC_PORT = 631; diff --git a/Source/Scripts/Northrend/IcecrownCitadel/InstanceIcecrownCitadel.cs b/Source/Scripts/Northrend/IcecrownCitadel/InstanceIcecrownCitadel.cs index a719bf03b..5d82240fe 100644 --- a/Source/Scripts/Northrend/IcecrownCitadel/InstanceIcecrownCitadel.cs +++ b/Source/Scripts/Northrend/IcecrownCitadel/InstanceIcecrownCitadel.cs @@ -1584,10 +1584,5 @@ namespace Scripts.Northrend.IcecrownCitadel { return new instance_icecrown_citadel_InstanceMapScript(map); } - - public static T GetInstanceAI(Creature creature) where T : CreatureAI - { - return GetInstanceAI(creature, "instance_icecrown_citadel"); - } } } diff --git a/Source/Scripts/Northrend/Ulduar/UlduarInstance.cs b/Source/Scripts/Northrend/Ulduar/UlduarInstance.cs index f04315f90..bb7c9b965 100644 --- a/Source/Scripts/Northrend/Ulduar/UlduarInstance.cs +++ b/Source/Scripts/Northrend/Ulduar/UlduarInstance.cs @@ -1232,10 +1232,5 @@ namespace Scripts.Northrend.Ulduar { return new instance_ulduar_InstanceMapScript(map); } - - public static T GetUlduarInstanceAI(WorldObject obj) where T : CreatureAI - { - return GetInstanceAI(obj, "instance_ulduar"); - } } }