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

Small changes and bug fixes

Browse Source
This commit is contained in:
EntenKoeniq
2022-04-12 08:15:25 +02:00
parent ea2af8070b
commit f6ceb7308b
3 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
Client/JavascriptHook.cs
View File

@ -36,7 +36,18 @@ namespace CoopClient
lock (_scriptEngines) lock (_scriptEngines)
{ {
_scriptEngines.ForEach(engine => engine.Script.API.InvokeTick()); _scriptEngines.ForEach(engine =>
{
try
{
engine.Script.API.InvokeTick();
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
});
} }
} }
@ -81,7 +92,16 @@ namespace CoopClient
engine.Execute(File.ReadAllText(script)); engine.Execute(File.ReadAllText(script));
try
{
engine.Script.API.InvokeStart(); engine.Script.API.InvokeStart();
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
_scriptEngines.Add(engine); _scriptEngines.Add(engine);
} }
catch (Exception ex) catch (Exception ex)
@ -100,8 +120,17 @@ namespace CoopClient
lock (_scriptEngines) lock (_scriptEngines)
{ {
_scriptEngines.ForEach(engine => _scriptEngines.ForEach(engine =>
{
try
{ {
engine.Script.API.InvokeStop(); engine.Script.API.InvokeStop();
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
engine.Dispose(); engine.Dispose();
}); });
_scriptEngines.Clear(); _scriptEngines.Clear();
@ -114,7 +143,18 @@ namespace CoopClient
{ {
lock (_scriptEngines) lock (_scriptEngines)
{ {
_scriptEngines.ForEach(engine => engine.Script.API.InvokePlayerConnect(username, nethandle)); _scriptEngines.ForEach(engine =>
{
try
{
engine.Script.API.InvokePlayerConnect(username, nethandle);
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
});
} }
} }
@ -122,7 +162,18 @@ namespace CoopClient
{ {
lock (_scriptEngines) lock (_scriptEngines)
{ {
_scriptEngines.ForEach(engine => engine.Script.API.InvokePlayerDisonnect(username, nethandle, reason)); _scriptEngines.ForEach(engine =>
{
try
{
engine.Script.API.InvokePlayerDisonnect(username, nethandle, reason);
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
});
} }
} }
@ -130,7 +181,18 @@ namespace CoopClient
{ {
lock (_scriptEngines) lock (_scriptEngines)
{ {
_scriptEngines.ForEach(engine => engine.Script.API.InvokeChatMessage(from, message)); _scriptEngines.ForEach(engine =>
{
try
{
engine.Script.API.InvokeChatMessage(from, message);
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
});
} }
} }
@ -138,7 +200,18 @@ namespace CoopClient
{ {
lock (_scriptEngines) lock (_scriptEngines)
{ {
_scriptEngines.ForEach(engine => engine.Script.API.InvokeServerEvent(eventName, args)); _scriptEngines.ForEach(engine =>
{
try
{
engine.Script.API.InvokeServerEvent(eventName, args);
}
catch (Exception ex)
{
GTA.UI.Notification.Show("~r~~h~Javascript Error");
Logger.Write(ex.Message, Logger.LogLevel.Server);
}
});
} }
} }
} }
@ -484,9 +557,9 @@ namespace CoopClient
MapLoader.LoadMap(name); MapLoader.LoadMap(name);
} }
public void DeleteMap() public void UnloadMap()
{ {
MapLoader.DeleteMap(); MapLoader.UnloadMap();
} }
private void AddServerEvent(string eventName, Action<object[]> action) private void AddServerEvent(string eventName, Action<object[]> action)

4
Client/MapLoader.cs
View File

@ -151,7 +151,7 @@ namespace CoopClient
lock (_createdObjects) return _createdObjects.Any(); lock (_createdObjects) return _createdObjects.Any();
} }
public static void DeleteMap() public static void UnloadMap()
{ {
lock (_createdObjects) lock (_createdObjects)
{ {
@ -170,7 +170,7 @@ namespace CoopClient
public static void DeleteAll() public static void DeleteAll()
{ {
DeleteMap(); UnloadMap();
lock (_maps) lock (_maps)
{ {
_maps.Clear(); _maps.Clear();

2
Server/DownloadManager.cs
View File

@ -254,7 +254,7 @@ namespace CoopServer
new Packets.FileTransferTick() { ID = file.FileID, FileChunk = file.FileChunks[FileDataPosition++] }.PacketToNetOutGoingMessage(outgoingMessage); new Packets.FileTransferTick() { ID = file.FileID, FileChunk = file.FileChunks[FileDataPosition++] }.PacketToNetOutGoingMessage(outgoingMessage);
Server.MainNetServer.SendMessage(outgoingMessage, conn, NetDeliveryMethod.ReliableUnordered, (byte)ConnectionChannel.File); Server.MainNetServer.SendMessage(outgoingMessage, conn, NetDeliveryMethod.ReliableOrdered, (byte)ConnectionChannel.File);
} }
public bool IsCurrentFile(int id) public bool IsCurrentFile(int id)