IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 13:15:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move mod loading to server entry point

Browse source
This commit is contained in:
Li 2022-05-07 13:30:51 +12:00
parent 518018e54e
commit 412430ec76
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
HorseIsleServer/LibHISP/Server/Entry.cs
View file

@ -7,7 +7,8 @@ using HISP.Game.Chat;
using HISP.Security; using HISP.Security;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using HISP.Modding;
namespace HISP.Server namespace HISP.Server
{ {
public static class Entry public static class Entry
@ -27,10 +28,12 @@ namespace HISP.Server
} }
public static void Start() public static void Start()
{ {
#if (!DEBUG) #if (!DEBUG)
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
#endif #endif
ModLoader.ReloadModsFromFilesystem();
Console.Title = ServerVersion.GetBuildString(); Console.Title = ServerVersion.GetBuildString();
ConfigReader.OpenConfig(); ConfigReader.OpenConfig();

2
HorseIsleServer/LibHISP/Server/GameServer.cs
View file

@ -8277,8 +8277,6 @@ namespace HISP.Server
minuteTimer = new Timer(new TimerCallback(onMinuteTick), null, oneMinute, oneMinute); minuteTimer = new Timer(new TimerCallback(onMinuteTick), null, oneMinute, oneMinute);
Logger.InfoPrint("Binding to ip: " + ConfigReader.BindIP + " On port: " + ConfigReader.Port.ToString()); Logger.InfoPrint("Binding to ip: " + ConfigReader.BindIP + " On port: " + ConfigReader.Port.ToString());
// Load all/any mods
ModLoader.ReloadModsFromFilesystem();
SocketAsyncEventArgs e = new SocketAsyncEventArgs(); SocketAsyncEventArgs e = new SocketAsyncEventArgs();
e.Completed += GameClient.CreateClient; e.Completed += GameClient.CreateClient;

4
HorseIsleServer/N00BS/Program.cs
View file

@ -7,6 +7,7 @@ using HISP.Game.Horse;
using HISP.Game.Items; using HISP.Game.Items;
using HISP.Game.Services; using HISP.Game.Services;
using HISP.Game.SwfModules; using HISP.Game.SwfModules;
using HISP.Modding;
using HISP.Security; using HISP.Security;
using HISP.Server; using HISP.Server;
using HTTP; using HTTP;
@ -74,6 +75,8 @@ namespace HISP.Noobs
BaseDir = Path.Combine(Environment.GetEnvironmentVariable("APPDATA"), "HISP", "N00BS"); BaseDir = Path.Combine(Environment.GetEnvironmentVariable("APPDATA"), "HISP", "N00BS");
Directory.CreateDirectory(BaseDir); Directory.CreateDirectory(BaseDir);
ModLoader.ReloadModsFromFilesystem();
// Start Web Server // Start Web Server
try try
{ {
@ -110,6 +113,7 @@ namespace HISP.Noobs
ConfigReader.CrossDomainPolicyFile = Path.Combine(BaseDir, "CrossDomainPolicy.xml"); ConfigReader.CrossDomainPolicyFile = Path.Combine(BaseDir, "CrossDomainPolicy.xml");
ConfigReader.DatabaseName = Path.Combine(BaseDir, "game1.db"); ConfigReader.DatabaseName = Path.Combine(BaseDir, "game1.db");
IncrementProgress(); IncrementProgress();
Database.OpenDatabase(); Database.OpenDatabase();
IncrementProgress(); IncrementProgress();