From 6229d7dda407187dfe8ffe7c743af1172ef5b143 Mon Sep 17 00:00:00 2001
From: AnloGames <7383an@gmail.com>
Date: Fri, 18 Aug 2023 04:19:55 +0300
Subject: [PATCH] merge commit

---
 .../GameCore/GameObjects/LivingEntities/Player/Player.cs     | 5 -----
 DangerousD/GameCore/Managers/MapManager.cs                   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
index 7fd1732..0a986b3 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
@@ -62,11 +62,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
             };
         }
 
-        public Player(Vector2 position, bool isInvincible) : this(position)
-        {
-            this.isInvincible = isInvincible;
-        }
-
         public bool IsAlive { get { return isAlive; } }
 
         protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "playerMoveLeft", "playerMoveRight", "DeathFromZombie", "playerRightStay", "playerStayLeft",
diff --git a/DangerousD/GameCore/Managers/MapManager.cs b/DangerousD/GameCore/Managers/MapManager.cs
index fd23e3c..6ab49b0 100644
--- a/DangerousD/GameCore/Managers/MapManager.cs
+++ b/DangerousD/GameCore/Managers/MapManager.cs
@@ -98,9 +98,9 @@ namespace DangerousD.GameCore.Managers
                     new Vector2(float.Parse(entity.Attributes["x"].Value, CultureInfo.InvariantCulture) + offsetX,
                         float.Parse(entity.Attributes["y"].Value, CultureInfo.InvariantCulture) + offsetY) * _scale;
                 Entity inst;
-                if (type.Equals(typeof(Player)) &&  entity.Attributes["name"] is not null && entity.Attributes["name"].Value == "DEBUGUS")
+                if (type.Equals(typeof(Player)))
                 {
-                    inst = (Entity)Activator.CreateInstance(type, pos, true);
+                    inst = (Entity)Activator.CreateInstance(type, pos, false);
                 }
                 else
                 {