Merge branch 'master' into master-1.0.6

This commit is contained in:
NotAlwaysTrue
2025-12-28 14:00:03 +08:00
committed by GitHub
6 changed files with 17 additions and 10 deletions
@@ -8,6 +8,9 @@ using System.Threading;
using System.Threading.Tasks;
using static Barotrauma.EosInterface.Ownership;
// DO NOT TOUCH ANYTHING HERE
// OR EVERYTHING WILL FAIL
namespace Barotrauma.Networking
{
class ServerEntityEvent : NetEntityEvent
@@ -3,11 +3,12 @@ using Barotrauma.Items.Components;
using FarseerPhysics;
using FarseerPhysics.Dynamics;
using Microsoft.Xna.Framework;
using MoonSharp.Interpreter;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Linq;
using MoonSharp.Interpreter;
namespace Barotrauma
{
@@ -162,13 +162,13 @@ namespace Barotrauma
});
GameMain.GameSession?.Update((float)deltaTime);
foreach (PhysicsBody body in physicsBodies)
Parallel.ForEach(physicsBodies, parallelOptions, body =>
{
if (body.Enabled && body.BodyType != BodyType.Static)
{
body.SetPrevTransform(body.SimPosition, body.Rotation);
}
}
});
MapEntity.ClearHighlightedEntities();