diff --git a/Source/Game/Scripting/CoreScripts.cs b/Source/Game/Scripting/CoreScripts.cs
index f415fd79b..f3b132ab9 100644
--- a/Source/Game/Scripting/CoreScripts.cs
+++ b/Source/Game/Scripting/CoreScripts.cs
@@ -286,10 +286,9 @@ namespace Game.Scripting
 
     public class UnitScript : ScriptObject
     {
-        public UnitScript(string name, bool addToScripts = true) : base(name)
+        public UnitScript(string name) : base(name)
         {
-            if (addToScripts)
-                Global.ScriptMgr.AddScript(this);
+            Global.ScriptMgr.AddScript(this);
         }
 
         public virtual void OnHeal(Unit healer, Unit reciever, ref uint gain) { }
@@ -324,9 +323,9 @@ namespace Game.Scripting
         object[] _args;
     }
 
-    public class CreatureScript : UnitScript
+    public class CreatureScript : ScriptObject
     {
-        public CreatureScript(string name) : base(name, false)
+        public CreatureScript(string name) : base(name)
         {
             Global.ScriptMgr.AddScript<CreatureScript>(this);
         }
@@ -582,9 +581,9 @@ namespace Game.Scripting
         public virtual bool OnCheck(Player source, Unit target) { return false; }
     }
 
-    public class PlayerScript : UnitScript
+    public class PlayerScript : ScriptObject
     {
-        public PlayerScript(string name) : base(name, false)
+        public PlayerScript(string name) : base(name)
         {
             Global.ScriptMgr.AddScript(this);
         }
diff --git a/Source/Game/Scripting/ScriptManager.cs b/Source/Game/Scripting/ScriptManager.cs
index c33c94e42..866680e15 100644
--- a/Source/Game/Scripting/ScriptManager.cs
+++ b/Source/Game/Scripting/ScriptManager.cs
@@ -1098,7 +1098,6 @@ namespace Game.Scripting
         {
             int dmg = damage;
             ForEach<UnitScript>(p => p.ModifySpellDamageTaken(target, attacker, ref dmg, spellInfo));
-            ForEach<PlayerScript>(p => p.ModifySpellDamageTaken(target, attacker, ref dmg, spellInfo));
             damage = dmg;
         }