From c75f6e4e67aeb0311ef4795d3dabfd472c1c6b9c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 12 Aug 2024 01:55:39 +0300 Subject: [PATCH 1/3] fix block.compose_state --- src/logic/scripting/lua/libblock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/scripting/lua/libblock.cpp b/src/logic/scripting/lua/libblock.cpp index af4cae48..145362b7 100644 --- a/src/logic/scripting/lua/libblock.cpp +++ b/src/logic/scripting/lua/libblock.cpp @@ -385,7 +385,7 @@ static int l_raycast(lua::State* L) { } static int l_compose_state(lua::State* L) { - if (lua::istable(L, 1) || lua::objlen(L, 1) < 3) { + if (!lua::istable(L, 1) || lua::objlen(L, 1) < 3) { throw std::runtime_error("expected array of 3 integers"); } blockstate state {}; From 698d02ceba72a053ed76fec6307bb83332b16bba Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 12 Aug 2024 02:01:55 +0300 Subject: [PATCH 2/3] fix fatal error caused by some unicode characters --- src/graphics/core/Font.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/graphics/core/Font.cpp b/src/graphics/core/Font.cpp index ca94bd8b..c12cd923 100644 --- a/src/graphics/core/Font.cpp +++ b/src/graphics/core/Font.cpp @@ -83,7 +83,10 @@ void Font::draw(Batch2D* batch, std::wstring_view text, int x, int y, FontStyle } uint charpage = c >> 8; if (charpage == page){ - Texture* texture = pages[charpage].get(); + Texture* texture = nullptr; + if (charpage < pages.size()) { + texture = pages[charpage].get(); + } if (texture == nullptr){ texture = pages[0].get(); } From 967b5e85a31ef3f09e2477ea778320ec557b3470 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 12 Aug 2024 02:21:32 +0300 Subject: [PATCH 3/3] update macos.yml --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index cec23dec..a477d3c0 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,7 +2,7 @@ name: Macos Build on: push: - branches: [ "main" ] + branches: [ "main", "release-**"] pull_request: branches: [ "main" ]