633e54b...7cc231b

commit 7cc231bc51890e7fde50bbac3413328dd7bc5189 Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Wed Mar 20 14:23:06 2019 +0200 Fixed server creating network events in Item.Load due to CreateServerEvent calls in some of the ItemComponent properties (e.g. LightComponent.IsOn). Caused syncing problems because the entity spawn events aren't created until the item has been loaded, leading to situations where clients fail to read events because the entity doesn't exist at their end yet (see #1293). TODO: get rid of console errors when attempting to create events during component initialization in the Item constructor. commit ac1bf32edf125d95d56775e1e8ce54ac7671328c Author: itchyOwl <lauri.harkanen@gmail.com> Date: Wed Mar 20 13:49:55 2019 +0200 Fix Hammerhead attack causing warping. Adjust the targeting priorities. commit e3e032d7c3a753397269bb4236c1494ab0809004 Author: itchyOwl <lauri.harkanen@gmail.com> Date: Wed Mar 20 13:48:47 2019 +0200 Enemy AI fixes: - Fix enemies "fleeing" after they have been shot. There was a steering issue when they targeted characters that were inside the sub when they were outside of it - Fix the previous target resetting too often - Fix the wall target resetting too often - Use world positions instead of sim positions where possible, because the sub positions are then taken into account commit 847cf5ffd9212a542000dbf12332b2c08756579a Author: Daniel Asteljoki <daniel.asteljoki@gmail.com> Date: Wed Mar 20 12:00:15 2019 +0200 Remora: added power connection between sub and drone, removed non-scaling hull parts commit a9c2e8cc124713e90dd44a9adf2fcbb3204b2c4d Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Wed Mar 20 11:24:37 2019 +0200 Server sets clients' last received campaign save/update IDs to one before the current up-to-date IDs (instead of zero) when a campaign changes. Zero would get interpreted as a more up-to-date ID if the IDs of the current campaign are close to ushort.MaxValue where the IDs wrap around. commit 07d82b64e6990eacaf8905aed1a5d7c61224e47d Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Tue Mar 19 18:24:01 2019 +0200 Log level inequality error messages & client error reports handled by the server to GameAnalytics
2019-03-20 14:25:03 +02:00
parent 6a12058148
commit 81fafaf3f5
16 changed files with 139 additions and 120 deletions
@@ -60,7 +60,6 @@ namespace Barotrauma

        public readonly XElement StaticBodyConfig;
        
-        private bool needsPositionUpdate;
        private float lastSentCondition;

        private float condition;
@@ -1811,8 +1810,20 @@ namespace Barotrauma
        }

        partial void UpdateNetPosition(float deltaTime);
-        
+
        public static Item Load(XElement element, Submarine submarine)
+        {
+            return Load(element, submarine, createNetworkEvent: false);
+        }
+
+        /// <summary>
+        /// Instantiate a new item and load its data from the XML element.
+        /// </summary>
+        /// <param name="element">The element containing the data of the item</param>
+        /// <param name="submarine">The submarine to spawn the item in (can be null)</param>
+        /// <param name="createNetworkEvent">Should an EntitySpawner event be created to notify clients about the item being created.</param>
+        /// <returns></returns>
+        public static Item Load(XElement element, Submarine submarine, bool createNetworkEvent)
        {
            string name = element.Attribute("name").Value;            
            string identifier = element.GetAttributeString("identifier", "");
@@ -1858,6 +1869,13 @@ namespace Barotrauma
                linkedToID = new List<ushort>()
            };

+#if SERVER
+            if (createNetworkEvent)
+            {
+                Spawner.CreateNetworkEvent(item, remove: false);
+            }
+#endif
+
            foreach (XAttribute attribute in element.Attributes())
            {
                if (!item.properties.TryGetValue(attribute.Name.ToString(), out SerializableProperty property)) continue;
@@ -1904,7 +1922,7 @@ namespace Barotrauma
            {
                component.OnItemLoaded();
            }
-
+            
            return item;
        }

@@ -91,6 +91,16 @@ namespace Barotrauma

        public override void CreateNetworkEvent()
        {
+            if (!Item.ItemList.Contains(container.Item))
+            {
+                string errorMsg = "Attempted to create a network event for an item (" + container.Item.Name + ") that hasn't been fully initialized yet.";
+                DebugConsole.ThrowError(errorMsg);
+                GameAnalyticsManager.AddErrorEventOnce(
+                    "ItemInventory.CreateServerEvent:EventForUninitializedItem" + container.Item.Name + container.Item.ID, 
+                    GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                return;
+            }
+
            int componentIndex = container.Item.GetComponentIndex(container);
            if (componentIndex == -1)
            {