[Lua API] Fixed crash.

Unarelith · Apr 23, 2023 · 5057e27 · 5057e27
1 parent 2f973ab
commit 5057e27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/mods/default/blocks.lua b/mods/default/blocks.lua
@@ -66,8 +66,6 @@ mod:block {
 	hardness = 0,
 	draw_type = "leaves",
 	-- is_opaque = false, -- FIXME
-
-	item_drop = {},
 }
 
 mod:block {
@@ -181,7 +179,6 @@ mod:block {
 	color_multiplier = {129, 191, 91, 255},
 	hardness = 0,
 	draw_type = "xshape",
-	item_drop = {},
 }
 
 mod:block {

diff --git a/source/server/lua/loader/LuaSkyLoader.cpp b/source/server/lua/loader/LuaSkyLoader.cpp
@@ -51,9 +51,12 @@ void LuaSkyLoader::loadSky(const sol::table &table) const {
 		sky.setFogColor(gk::Color::fromRGBA32(r, g, b, a));
 	}
 
-	if (sol::object obj = table["daylight_cycle"].get<sol::table>() ; obj.valid()) {
-		sol::table daylightCycleTable = obj.as<sol::table>();
-		sky.setDaylightCycleSpeed(daylightCycleTable["speed"].get_or(0.f));
+	if (table["daylight_cycle"].valid()) {
+		sol::object obj = table["daylight_cycle"].get<sol::table>();
+		if (obj.valid()) {
+			sol::table daylightCycleTable = obj.as<sol::table>();
+			sky.setDaylightCycleSpeed(daylightCycleTable["speed"].get_or(0.f));
+		}
 	}
 
 	loadObjects(sky, table);