Cyber/Minecraft-Realms-Emulator
1
1
Fork 0
mirror of https://github.com/CyberL1/Minecraft-Realms-Emulator.git synced 2024-12-22 12:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: update game version on slot if server has updates enabled

Browse Source
This commit is contained in:
CyberL1 2024-12-19 21:06:02 +01:00
parent 484d12463a
commit ff325cf5f6
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -902,7 +902,7 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Controllers
[HttpGet("v1/{wId}/join/pc")] [HttpGet("v1/{wId}/join/pc")]
public async Task<ActionResult<Connection>> Join(int wId) public async Task<ActionResult<Connection>> Join(int wId)
{ {
var connection = _context.Connections.Include(c => c.World).FirstOrDefault(x => x.World.Id == wId); var connection = _context.Connections.Include(c => c.World).Include(c => c.World.Slots).FirstOrDefault(x => x.World.Id == wId);
var isRunning = new DockerHelper(connection.World).IsRunning(); var isRunning = new DockerHelper(connection.World).IsRunning();
var query = new MinecraftServerQuery().Query(connection.Address); var query = new MinecraftServerQuery().Query(connection.Address);
@ -918,7 +918,17 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Controllers
query = new MinecraftServerQuery().Query(connection.Address); query = new MinecraftServerQuery().Query(connection.Address);
} }
Slot activeSlot = connection.World.Slots.Find(s => s.SlotId == connection.World.ActiveSlot);
string cookie = Request.Headers.Cookie; string cookie = Request.Headers.Cookie;
string gameVersion = cookie.Split(";")[2].Split("=")[1];
if (new MinecraftVersionParser.MinecraftVersion(activeSlot.Version).CompareTo(new MinecraftVersionParser.MinecraftVersion(gameVersion)) < 0 && new DockerHelper(connection.World).RunCommand("! test -f .no-update") == 0)
{
activeSlot.Version = gameVersion;
_context.SaveChanges();
}
string playerUUID = cookie.Split(";")[0].Split(":")[2]; string playerUUID = cookie.Split(";")[0].Split(":")[2];
if (connection.World.OwnerUUID == playerUUID) if (connection.World.OwnerUUID == playerUUID)

5
Minecraft-Realms-Emulator/Modes/Realms/Helpers/DockerHelper.cs
View File

@ -116,7 +116,7 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Helpers
commandProcess.Start(); commandProcess.Start();
} }
public void RunCommand(string command) public int RunCommand(string command)
{ {
ProcessStartInfo commandProcessInfo = new(); ProcessStartInfo commandProcessInfo = new();
@ -127,6 +127,9 @@ namespace Minecraft_Realms_Emulator.Modes.Realms.Helpers
commandProcess.StartInfo = commandProcessInfo; commandProcess.StartInfo = commandProcessInfo;
commandProcess.Start(); commandProcess.Start();
commandProcess.WaitForExit();
return commandProcess.ExitCode;
} }
} }
} }