Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Scripts: Fixes a crash when entering a instance

Browse Source
This commit is contained in:
hondacrx
2018-06-23 12:35:12 -04:00
parent c174f06c67
commit 1973d4f2ce
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Scripting/CoreScripts.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace Game.Scripting
{
InstanceMap instance = obj.GetMap().ToInstanceMap();
if (instance != null && instance.GetInstanceScript() != null)
return (T)Activator.CreateInstance(typeof(T), obj);
return (T)Activator.CreateInstance(typeof(T), new object[] { obj });
return null;
}
Source/Game/Scripting/ScriptManager.cs
+1 -1
View File
@@ -1548,7 +1548,7 @@ namespace Game.Scripting
[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
public class ScriptAttribute : Attribute
{
public ScriptAttribute(string name="", params object[] args)
public ScriptAttribute(string name = "", params object[] args)
{
Name = name;
Args = args;
Source/Scripts/EasternKingdoms/ScarletEnclave/Chapter1.cs
+3 -3
View File
@@ -132,7 +132,7 @@ namespace Scripts.EasternKingdoms
}
[Script]
public class npc_unworthy_initiate : ScriptedAI
class npc_unworthy_initiate : ScriptedAI
{
public npc_unworthy_initiate(Creature creature) : base(creature)
{
@@ -940,9 +940,9 @@ namespace Scripts.EasternKingdoms
}
[Script]
class npc_scarlet_minerAI : npc_escortAI
class npc_scarlet_miner : npc_escortAI
{
public npc_scarlet_minerAI(Creature creature) : base(creature)
public npc_scarlet_miner(Creature creature) : base(creature)
{
Initialize();
me.SetReactState(ReactStates.Passive);