Merge branch 'DevelopmentX' of github.com:progtime-net/ZoFo into DevelopmentX

ZoFo/GameCore/Client.cs

@@ -197,6 +197,7 @@ namespace ZoFo.GameCore
             }
             else if (update is UpdateGameObjectCreated)
             {
+                //TODO
                 Entity created_gameObject;
                 if ((update as UpdateGameObjectCreated).GameObjectType == "Player")
                 {

ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateGameObjectDeleted.cs

@@ -12,6 +12,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient
     public class UpdateGameObjectDeleted : UpdateData    
     {
         public UpdateGameObjectDeleted() { UpdateType = "UpdateGameObjectDeleted";  isImportant = false; }
-        public string GameObjectType;
+        public string GameObjectType { get; set; }
     }
 }

ZoFo/GameCore/GameObjects/Entities/Entity.cs

@@ -58,9 +58,12 @@ namespace ZoFo.GameCore.GameObjects
         }
 
         public virtual void Delete()
+        {
+            if (AppManager.Instance.gamestate == GameState.HostPlaying)
             {
                 AppManager.Instance.server.DeleteObject(this);
             }
         }
     }
+}
 

ZoFo/GameCore/GameObjects/GameObject.cs

@@ -43,9 +43,12 @@ public abstract class GameObject
     }
 
     public void Instantiate(GameObject gameObject)
+    {
+        if (AppManager.Instance.gamestate == GameState.HostPlaying)
         {
             AppManager.Instance.server.RegisterGameObject(gameObject);
         }
+    }
     #endregion
 
 

ZoFo/GameCore/Server.cs

@@ -123,6 +123,7 @@ namespace ZoFo.GameCore
             networkManager.StartGame();
             new MapManager().LoadMap();
 
+            //TODO
             //AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(0, 0)));
             AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(760, 140)));
             //for (int i = 0; i < 20; i++)