Another Network Improvment(2 players support)

DangerousD/GameCore/GameObjects/GameObject.cs

@@ -15,6 +15,7 @@ namespace DangerousD.GameCore
         protected Vector2 _pos;
         public Vector2 Pos => _pos;
         public int id;
+        public bool isIdFromHost = false;
         public int Width { get; set; }
         public int Height { get; set; }
         public Rectangle Rectangle => new Rectangle((int)Pos.X, (int)Pos.Y, Width, Height);

DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs

@@ -32,16 +32,17 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         private int bullets;
         public bool FallingThroughPlatform = false;
 
-        public Player(Vector2 position) : base(position)
+        public Player(Vector2 position, bool isNetworkPlayer = false) : base(position)
         {
             Width = 16;
             Height = 32;
 
-            AppManager.Instance.InputManager.ShootEvent += Shoot;
+            if (!isNetworkPlayer)
-
+            {
-            AppManager.Instance.InputManager.MovEventJump += Jump;
+                AppManager.Instance.InputManager.ShootEvent += Shoot;
-            AppManager.Instance.InputManager.MovEventDown += MoveDown;
+                AppManager.Instance.InputManager.MovEventJump += Jump;
-            AppManager.Instance.InputManager.ShootEvent += Shoot;
+                AppManager.Instance.InputManager.MovEventDown += MoveDown;
+            }
 
            velocity = new Vector2(0, 0);
             rightBorder = (int)position.X + 100;

DangerousD/GameCore/Managers/AppManager.cs

@@ -12,6 +12,7 @@ using MonogameLibrary.UI.Base;
 using DangerousD.GameCore.Managers;
 using DangerousD.GameCore.GameObjects.LivingEntities;
 using DangerousD.GameCore.GameObjects;
+using System.Threading.Tasks;
 
 namespace DangerousD.GameCore
 {
@@ -111,6 +112,8 @@ namespace DangerousD.GameCore
             if (GamePad.GetState(PlayerIndex.One).Buttons.Back == ButtonState.Pressed || Keyboard.GetState().IsKeyDown(Keys.Escape))
                 Exit();
 
+            if (GameManager.GetPlayer1 != null) 
+                DebugHUD.Set("Objid: ", GameManager.GetPlayer1.id.ToString());
             InputManager.Update();
             SoundManager.Update();
 
@@ -225,24 +228,40 @@ namespace DangerousD.GameCore
                     case NetworkTaskOperationEnum.CreateEntity:
                         break;
                     case NetworkTaskOperationEnum.SendPosition:
-                        LivingEntity entity = GameManager.livingEntities.Find(x => x.id == networkTask.objId);
+                        if (networkTask.objId != GameManager.GetPlayer1.id)
-                        entity.SetPosition(networkTask.position);
+                        {
+                            LivingEntity entity = GameManager.livingEntities.Find(x => x.id == networkTask.objId);
+                            entity.SetPosition(networkTask.position);
+                            if (multiPlayerStatus == MultiPlayerStatus.Host)
+                            {
+                                NetworkTasks.Add(networkTask);  
+                            }
+                        }
                         break;
                     case NetworkTaskOperationEnum.ChangeState:
                         break;
                     case NetworkTaskOperationEnum.ConnectToHost:
-                        Player connectedPlayer = new Player(Vector2.Zero);
+                        Player connectedPlayer = new Player(Vector2.Zero, true);
                         NetworkTasks.Add(new NetworkTask(connectedPlayer.id));
                         NetworkTask task = new NetworkTask();
-                        NetworkTasks.Add(task.AddConnectedPlayer(GameManager.GetPlayer1.id, GameManager.GetPlayer1.Pos));
+                        foreach (Player player in GameManager.players)
+                        {
+                            if (player.id != connectedPlayer.id)
+                            {
+                                NetworkTasks.Add(task.AddConnectedPlayer(player.id, player.Pos));
+                            }
+                        }
                         break;
                     case NetworkTaskOperationEnum.GetClientPlayerId:
-                        GameManager.GetPlayer1.id = networkTask.objId;
+                        if (!GameManager.GetPlayer1.isIdFromHost)
+                        {
+                            GameManager.GetPlayer1.id = networkTask.objId;
+                            GameManager.GetPlayer1.isIdFromHost = true;
+                        }
                         break;
                     case NetworkTaskOperationEnum.AddConnectedPlayer:
-                        Player remoteConnectedPlayer = new Player(networkTask.position);
+                        Player remoteConnectedPlayer = new Player(networkTask.position, true);
                         remoteConnectedPlayer.id = networkTask.objId;
-                        GameManager.players.Add(remoteConnectedPlayer);
                         break;
                     default:
                         break;

DangerousD/GameCore/Managers/GameManager.cs

@@ -129,7 +129,6 @@ namespace DangerousD.GameCore
 
         public void Update(GameTime gameTime)
         {
-            AppManager.Instance.DebugHUD.Set("playerId: ", GetPlayer1.id.ToString());
             if (AppManager.Instance.NetworkTasks.Count > 0)
             {
                 AppManager.Instance.NetworkManager.SendMsg(AppManager.Instance.NetworkTasks.ToList());
@@ -147,7 +146,6 @@ namespace DangerousD.GameCore
                 {
                     livingEntitiesWithoutPlayers[i].Update(gameTime);
                 }
-                GetPlayer1.Update(gameTime);
             }
             else
             {
@@ -155,7 +153,6 @@ namespace DangerousD.GameCore
                 {
                     livingEntitiesWithoutPlayers[i].PlayAnimation();
                 }
-                GetPlayer1.Update(gameTime);
             }
             GetPlayer1.Update(gameTime);
             foreach (var item in otherObjects)

DangerousD/GameCore/Network/NetworkManager.cs

@@ -91,7 +91,7 @@ namespace DangerousD.GameCore.Network
             }
             catch { }
         }
-        public void SendMsg(List<NetworkTask> networkTask)
+        public void SendMsg(List<NetworkTask> networkTask, Socket ignoreSocket = null)
         {
             byte[] Data = Encoding.Unicode.GetBytes(JsonConvert.SerializeObject(networkTask));
             int count = Data.Length;
@@ -101,8 +101,11 @@ namespace DangerousD.GameCore.Network
                 {
                     foreach (Socket socket in clientSockets)
                     {
-                        socket.Send(BitConverter.GetBytes(count));
+                        if (!(socket == ignoreSocket))
-                        socket.Send(Data);
+                        {
+                            socket.Send(BitConverter.GetBytes(count));
+                            socket.Send(Data);
+                        }
                     }
                 }
                 catch { }
@@ -148,7 +151,8 @@ namespace DangerousD.GameCore.Network
                 }
                 else
                 {
-                    GetReceivingMessages(JsonConvert.DeserializeObject<List<NetworkTask>>(so.sb.ToString()));
+                    List<NetworkTask> tasks = JsonConvert.DeserializeObject<List<NetworkTask>>(so.sb.ToString());
+                    GetReceivingMessages(tasks);
                 }
             }
             catch { }