Cyber/Minecraft-Realms-Emulator
1
1
Fork 0
mirror of https://github.com/CyberL1/Minecraft-Realms-Emulator.git synced 2025-04-02 14:08:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Cyber:7bc0169ddaaa7c669b65dedee4a1e6459f517d3b
Branches Tags
Cyber:master
...
compare: Cyber:50042e96adfaa08295c952e406dd418e60d39ba4
Branches Tags
Cyber:master

3 Commits
7bc0169dda ... 50042e96ad

Author SHA1 Message Date
CyberL1
50042e96ad chore: update packages 2024-07-06 12:50:51 +02:00
CyberL1
c1353de565 feat: start server if stopped on join 2024-07-06 10:24:45 +02:00
CyberL1
640cc80758 feat: wait for server to be accessible on open 2024-07-06 09:06:00 +02:00
2 changed files with 23 additions and 4 deletions
Show Stats Expand all files Collapse all files

4
Minecraft-Realms-Emulator/Minecraft-Realms-Emulator.csproj
View File

@ -14,8 +14,8 @@
<ItemGroup>
<PackageReference Include="DotNetEnv" Version="3.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

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

@ -676,6 +676,15 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Controllers
_context.SaveChanges();
var connection = _context.Connections.FirstOrDefault(c => c.World.Id == wId);
var query = new MinecraftServerQuery().Query(connection.Address);
while (query == null)
{
await Task.Delay(1000);
query = new MinecraftServerQuery().Query(connection.Address);
}
return Ok(true);
}
@ -894,9 +903,19 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Controllers
}
[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);
}