Unstable 0.17.4.0

2022-03-30 00:08:09 +09:00
parent 2968e23ae8
commit c1b8e5a341
177 changed files with 3388 additions and 1977 deletions
@@ -42,8 +42,8 @@ namespace Barotrauma.Items.Components
                msg.Write(item.CurrentHull?.ID ?? Entity.NullEntityID);
                msg.Write(item.SimPosition.X);
                msg.Write(item.SimPosition.Y);
-                msg.Write(stickJoint.Axis.X);
-                msg.Write(stickJoint.Axis.Y);
+                msg.Write(jointAxis.X);
+                msg.Write(jointAxis.Y);
                if (StickTarget.UserData is Structure structure)
                {
                    msg.Write(structure.ID);
@@ -56,7 +56,6 @@ namespace Barotrauma
                    if (containerIndex < 0)
                    {
                        throw error($"container index out of range ({containerIndex})");
-                        break;
                    }
                    if (!(components[containerIndex] is ItemContainer itemContainer))
                    {
@@ -66,7 +65,7 @@ namespace Barotrauma
                    msg.Write(GameMain.Server.EntityEventManager.Events.Last()?.ID ?? (ushort)0);
                    itemContainer.Inventory.ServerEventWrite(msg, c);
                    break;
-                case StatusEventData _:
+                case ItemStatusEventData _:
                    msg.Write(condition);
                    break;
                case AssignCampaignInteractionEventData _: