vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Faction Test 100.13.0.0

Browse Source
This commit is contained in:
Markus Isberg
2023-01-11 15:36:23 +02:00
parent 1650735468
commit caa5a2f762
145 changed files with 2100 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs
+1 -10
View File
@@ -302,12 +302,8 @@ namespace Barotrauma
}
}
public void ServerWritePosition(IWriteMessage msg, Client c)
public void ServerWritePosition(ReadWriteMessage tempBuffer, Client c)
{
msg.WriteUInt16(ID);
IWriteMessage tempBuffer = new WriteOnlyMessage();
if (this == c.Character)
{
tempBuffer.WriteBoolean(true);
@@ -405,11 +401,6 @@ namespace Barotrauma
AIController?.ServerWrite(tempBuffer);
HealthUpdatePending = false;
}
tempBuffer.WritePadBits();
msg.WriteVariableUInt32((uint)tempBuffer.LengthBytes);
msg.WriteBytes(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
}
public virtual void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
Barotrauma/BarotraumaServer/ServerSource/Events/EventActions/ConversationAction.cs
+13 -3
View File
@@ -41,7 +41,7 @@ namespace Barotrauma
clientsToRemove.Add(k);
}
}
if (!(clientsToRemove is null))
if (clientsToRemove is not null)
{
foreach (var k in clientsToRemove)
{
@@ -62,7 +62,7 @@ namespace Barotrauma
{
foreach (Entity e in targets)
{
if (!(e is Character character) || !character.IsRemotePlayer) { continue; }
if (e is not Character character || !character.IsRemotePlayer) { continue; }
Client targetClient = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
if (targetClient != null)
{
@@ -85,7 +85,7 @@ namespace Barotrauma
IEnumerable<Entity> entities = ParentEvent.GetTargets(TargetTag);
foreach (Entity e in entities)
{
if (!(e is Character character) || !character.IsRemotePlayer) { continue; }
if (e is not Character character || !character.IsRemotePlayer) { continue; }
Client targetClient = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
if (targetClient != null)
{
@@ -149,5 +149,15 @@ namespace Barotrauma
}
GameMain.Server?.ServerPeer?.Send(outmsg, client.Connection, DeliveryMethod.Reliable);
}
public void ServerWriteSelectedOption(Client client)
{
IWriteMessage outmsg = new WriteOnlyMessage();
outmsg.WriteByte((byte)ServerPacketHeader.EVENTACTION);
outmsg.WriteByte((byte)EventManager.NetworkEventType.CONVERSATION_SELECTED_OPTION);
outmsg.WriteUInt16(Identifier);
outmsg.WriteByte((byte)(selectedOption + 1));
GameMain.Server?.ServerPeer?.Send(outmsg, client.Connection, DeliveryMethod.Reliable);
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Events/EventManager.cs
+10 -2
View File
@@ -14,12 +14,12 @@ namespace Barotrauma
foreach (Event ev in activeEvents)
{
if (!(ev is ScriptedEvent scriptedEvent)) { continue; }
if (ev is not ScriptedEvent scriptedEvent) { continue; }
var actions = FindActions(scriptedEvent);
foreach (EventAction action in actions.Select(a => a.Item2))
{
if (!(action is ConversationAction convAction) || convAction.Identifier != actionId) { continue; }
if (action is not ConversationAction convAction || convAction.Identifier != actionId) { continue; }
if (!convAction.TargetClients.Contains(sender))
{
#if DEBUG || UNSTABLE
@@ -42,6 +42,14 @@ namespace Barotrauma
else
{
convAction.SelectedOption = selectedOption;
if (convAction.Options.Any() && !convAction.GetEndingOptions().Contains(selectedOption))
{
foreach (Client c in convAction.TargetClients)
{
if (c == sender) { continue; }
convAction.ServerWriteSelectedOption(c);
}
}
}
}
return;
Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
+1
View File
@@ -66,6 +66,7 @@ namespace Barotrauma
public static ContentPackage VanillaContent => ContentPackageManager.VanillaCorePackage;
public readonly string[] CommandLineArgs;
public GameMain(string[] args)
Barotrauma/BarotraumaServer/ServerSource/Items/Components/Projectile.cs
+1 -1
View File
@@ -28,7 +28,7 @@ namespace Barotrauma.Items.Components
msg.WriteBoolean(launch);
if (launch)
{
msg.WriteUInt16(User?.ID ?? 0);
msg.WriteUInt16(User?.ID ?? Entity.NullEntityID);
msg.WriteSingle(launchPos.X);
msg.WriteSingle(launchPos.Y);
msg.WriteSingle(launchRot);
Barotrauma/BarotraumaServer/ServerSource/Items/Item.cs
+2 -8
View File
@@ -349,15 +349,9 @@ namespace Barotrauma
}
}
public void ServerWritePosition(IWriteMessage msg, Client c)
public void ServerWritePosition(ReadWriteMessage tempBuffer, Client c)
{
msg.WriteUInt16(ID);
IWriteMessage tempBuffer = new WriteOnlyMessage();
body.ServerWrite(tempBuffer);
msg.WriteVariableUInt32((uint)tempBuffer.LengthBytes);
msg.WriteBytes(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
msg.WritePadBits();
}
public void CreateServerEvent<T>(T ic) where T : ItemComponent, IServerSerializable
@@ -379,7 +373,7 @@ namespace Barotrauma
if (!components.Contains(ic)) { return; }
var eventData = new ComponentStateEventData(ic, extraData);
if (!ic.ValidateEventData(eventData)) { throw new Exception($"Component event creation failed: {typeof(T).Name}.{nameof(ItemComponent.ValidateEventData)} returned false"); }
if (!ic.ValidateEventData(eventData)) { throw new Exception($"Component event creation for the item \"{Prefab.Identifier}\" failed: {typeof(T).Name}.{nameof(ItemComponent.ValidateEventData)} returned false."); }
GameMain.Server.CreateEntityEvent(this, eventData);
}
Barotrauma/BarotraumaServer/ServerSource/Map/Submarine.cs
+1 -6
View File
@@ -5,14 +5,9 @@ namespace Barotrauma
{
partial class Submarine
{
public void ServerWritePosition(IWriteMessage msg, Client c)
public void ServerWritePosition(ReadWriteMessage tempBuffer, Client c)
{
msg.WriteUInt16(ID);
IWriteMessage tempBuffer = new WriteOnlyMessage();
subBody.Body.ServerWrite(tempBuffer);
msg.WriteByte((byte)tempBuffer.LengthBytes);
msg.WriteBytes(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
msg.WritePadBits();
}
public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
+4 -3
View File
@@ -1745,9 +1745,9 @@ namespace Barotrauma.Networking
continue;
}
IWriteMessage tempBuffer = new ReadWriteMessage();
tempBuffer.WriteBoolean(entity is Item); tempBuffer.WritePadBits();
tempBuffer.WriteUInt32(entity is MapEntity me ? me.Prefab.UintIdentifier : (UInt32)0);
var tempBuffer = new ReadWriteMessage();
var entityPositionHeader = EntityPositionHeader.FromEntity(entity);
tempBuffer.WriteNetSerializableStruct(entityPositionHeader);
entityPositionSync.ServerWritePosition(tempBuffer, c);
//no more room in this packet
@@ -1758,6 +1758,7 @@ namespace Barotrauma.Networking
segmentTable.StartNewSegment(ServerNetSegment.EntityPosition);
outmsg.WritePadBits(); //padding is required here to make sure any padding bits within tempBuffer are read correctly
outmsg.WriteVariableUInt32((uint)tempBuffer.LengthBytes);
outmsg.WriteBytes(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
outmsg.WritePadBits();