Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small changes

Browse Source
This commit is contained in:
EntenKoeniq
2021-12-17 22:16:39 +01:00
parent 4510543c8e
commit c77e2a0287
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/CoopServer.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>1.11.0.0001</AssemblyVersion> <AssemblyVersion>1.12.0.0001</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion> <FileVersion>1.0.0.0</FileVersion>
<RepositoryUrl>https://github.com/GTACOOP-R/GTACoop-R</RepositoryUrl> <RepositoryUrl>https://github.com/GTACOOP-R/GTACoop-R</RepositoryUrl>
</PropertyGroup> </PropertyGroup>

31
Server/Server.cs
View File

@ -430,11 +430,20 @@ namespace CoopServer
packet = new ModPacket(); packet = new ModPacket();
packet.NetIncomingMessageToPacket(message); packet.NetIncomingMessageToPacket(message);
ModPacket modPacket = (ModPacket)packet; ModPacket modPacket = (ModPacket)packet;
if (Resources.Any(x => x.InvokeModPacketReceived(modPacket.NetHandle, modPacket.Target, modPacket.Mod, modPacket.CustomPacketID, modPacket.Bytes)))
bool resourceResult = false;
if (Resources.Any())
{ {
// Was canceled Resources.ForEach(x =>
{
if (x.InvokeModPacketReceived(modPacket.NetHandle, modPacket.Target, modPacket.Mod, modPacket.CustomPacketID, modPacket.Bytes))
{
resourceResult = true;
}
});
} }
else if (modPacket.Target != -1)
if (!resourceResult && modPacket.Target != -1)
{ {
NetOutgoingMessage outgoingMessage = MainNetServer.CreateMessage(); NetOutgoingMessage outgoingMessage = MainNetServer.CreateMessage();
modPacket.PacketToNetOutGoingMessage(outgoingMessage); modPacket.PacketToNetOutGoingMessage(outgoingMessage);
@ -938,9 +947,21 @@ namespace CoopServer
return; return;
} }
if (Resources.Any(x => x.InvokeChatMessage(packet.Username, packet.Message))) if (Resources.Any())
{ {
return; bool resourceResult = false;
Resources.ForEach(x =>
{
if (x.InvokeChatMessage(packet.Username, packet.Message))
{
resourceResult = true;
}
});
if (resourceResult)
{
return;
}
} }
} }