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

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

1 files changed, 17 insertions, 3 deletions

diff --git a/Minecraft.World/DerivedLevelData.cpp b/Minecraft.World/DerivedLevelData.cpp
index 71c4d87b..198b8c76 100644
--- a/Minecraft.World/DerivedLevelData.cpp
+++ b/Minecraft.World/DerivedLevelData.cpp
@@ -43,9 +43,14 @@ int DerivedLevelData::getZSpawn()
 	return wrapped->getZSpawn();
 }
 
-__int64 DerivedLevelData::getTime()
+__int64 DerivedLevelData::getGameTime()
 {
-	return wrapped->getTime();
+	return wrapped->getGameTime();
+}
+
+__int64 DerivedLevelData::getDayTime()
+{
+	return wrapped->getDayTime();
 }
 
 __int64 DerivedLevelData::getSizeOnDisk()
@@ -114,7 +119,11 @@ void DerivedLevelData::setZSpawn(int zSpawn)
 {
 }
 
-void DerivedLevelData::setTime(__int64 time)
+void DerivedLevelData::setGameTime(__int64 time)
+{
+}
+
+void DerivedLevelData::setDayTime(__int64 time)
 {
 }
 
@@ -198,6 +207,11 @@ void DerivedLevelData::setInitialized(bool initialized)
 {
 }
 
+GameRules *DerivedLevelData::getGameRules()
+{
+	return wrapped->getGameRules();
+}
+
 int DerivedLevelData::getXZSize()
 {
 	return wrapped->getXZSize();