OpenCodeBox/fishbait
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Merge Errors

Browse source
This commit is contained in:
Derek S 2021-04-06 10:46:19 -05:00
parent d6c8a0d09d
commit e044310919
2 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/Program.cs
View file

@ -15,30 +15,6 @@ namespace LightReflectiveMirror
{ {
partial class Program partial class Program
{ {
public static Transport transport;
public static Program instance;
public static Config conf;
private RelayHandler _relay;
private MethodInfo _awakeMethod;
private MethodInfo _startMethod;
private MethodInfo _updateMethod;
private MethodInfo _lateUpdateMethod;
private DateTime _startupTime;
public static string publicIP;
private List<int> _currentConnections = new List<int>();
public Dictionary<int, IPEndPoint> NATConnections = new Dictionary<int, IPEndPoint>();
private BiDictionary<int, string> _pendingNATPunches = new BiDictionary<int, string>();
private int _currentHeartbeatTimer = 0;
private byte[] _NATRequest = new byte[500];
private int _NATRequestPosition = 0;
private UdpClient _punchServer;
private readonly string CONFIG_PATH = System.Environment.GetEnvironmentVariable("LRM_CONFIG_PATH") ?? "config.json";
public static void Main(string[] args) => new Program().MainAsync().GetAwaiter().GetResult(); public static void Main(string[] args) => new Program().MainAsync().GetAwaiter().GetResult();
public List<Room> GetRooms() => _relay.rooms; public List<Room> GetRooms() => _relay.rooms;

2
ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/ProgramVariables.cs
View file

@ -32,6 +32,6 @@ namespace LightReflectiveMirror
private UdpClient _punchServer; private UdpClient _punchServer;
private const string CONFIG_PATH = "config.json"; private readonly string CONFIG_PATH = System.Environment.GetEnvironmentVariable("LRM_CONFIG_PATH") ?? "config.json";
} }
} }