Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 7 insertions, 2 deletions

diff --git a/Minecraft.World/TimeCommand.cpp b/Minecraft.World/TimeCommand.cpp
index e667a420..4ac23c94 100644
--- a/Minecraft.World/TimeCommand.cpp
+++ b/Minecraft.World/TimeCommand.cpp
@@ -10,6 +10,11 @@ EGameCommand TimeCommand::getId()
 	return eGameCommand_Time;
 }
 
+int TimeCommand::getPermissionLevel()
+{
+	return LEVEL_GAMEMASTERS;
+}
+
 void TimeCommand::execute(shared_ptr<CommandSender> source, byteArray commandData)
 {
 	ByteArrayInputStream bais(commandData);
@@ -56,7 +61,7 @@ void TimeCommand::doSetTime(shared_ptr<CommandSender> source, int value)
 {
 	for (int i = 0; i < MinecraftServer::getInstance()->levels.length; i++)
 	{
-		MinecraftServer::getInstance()->levels[i]->setTimeAndAdjustTileTicks(value);
+		MinecraftServer::getInstance()->levels[i]->setDayTime(value);
 	}
 }
 
@@ -65,7 +70,7 @@ void TimeCommand::doAddTime(shared_ptr<CommandSender> source, int value)
 	for (int i = 0; i < MinecraftServer::getInstance()->levels.length; i++)
 	{
 		ServerLevel *level = MinecraftServer::getInstance()->levels[i];
-		level->setTimeAndAdjustTileTicks(level->getTime() + value);
+		level->setDayTime(level->getDayTime() + value);
 	}
 }