Cyber/Minecraft-Realms-Emulator
1
0
Fork 0
mirror of https://github.com/CyberL1/Minecraft-Realms-Emulator.git synced 2024-11-24 15:18:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: start server if stopped on join

Browse Source
This commit is contained in:
CyberL1 2024-07-06 10:24:45 +02:00
parent 640cc80758
commit c1353de565
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Minecraft-Realms-Emulator/Modes/Realms/Controllers/WorldsController.cs
View File

@ -667,32 +667,27 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Controllers
[CheckActiveSubscription] [CheckActiveSubscription]
public async Task<ActionResult<bool>> Open(int wId) public async Task<ActionResult<bool>> Open(int wId)
{ {
var worlds = await _context.Worlds.ToListAsync(); var worlds = await _context.Worlds.ToListAsync();
var world = worlds.Find(w => w.Id == wId); var world = worlds.Find(w => w.Id == wId);
new DockerHelper(world).StartServer(); new DockerHelper(world).StartServer();
world.State = nameof(StateEnum.OPEN); world.State = nameof(StateEnum.OPEN);
_context.SaveChanges(); _context.SaveChanges();
var connection = _context.Connections.FirstOrDefault(c => c.World.Id == wId); var connection = _context.Connections.FirstOrDefault(c => c.World.Id == wId);
var query = new MinecraftServerQuery().Query(connection.Address); var query = new MinecraftServerQuery().Query(connection.Address);
while (query == null) while (query == null)
{
var newQuery = new MinecraftServerQuery().Query(connection.Address);
if (newQuery != null)
{ {
break; await Task.Delay(1000);
query = new MinecraftServerQuery().Query(connection.Address);
} }
}
return Ok(true); return Ok(true);
} }
[HttpPut("{wId}/close")] [HttpPut("{wId}/close")]
[CheckForWorld] [CheckForWorld]
@ -909,9 +904,19 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Controllers
} }
[HttpGet("v1/{wId}/join/pc")] [HttpGet("v1/{wId}/join/pc")]
public ActionResult<Connection> Join(int wId) public async Task<ActionResult<Connection>> Join(int wId)
{ {
var connection = _context.Connections.FirstOrDefault(x => x.World.Id == wId); var connection = _context.Connections.Include(c => c.World).FirstOrDefault(x => x.World.Id == wId);
var query = new MinecraftServerQuery().Query(connection.Address);
if (query == null) new DockerHelper(connection.World).StartServer();
while (query == null)
{
await Task.Delay(1000);
query = new MinecraftServerQuery().Query(connection.Address);
}
return Ok(connection); return Ok(connection);
} }