From c6c5050ea1a79ab731d1afda4cb2af6faedb60bf Mon Sep 17 00:00:00 2001 From: A-lex-Ra Date: Sun, 14 Jan 2024 10:06:12 +0600 Subject: [PATCH 1/2] msvc preproc fix --- src/logic/scripting/api_lua.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/scripting/api_lua.cpp b/src/logic/scripting/api_lua.cpp index c48e4000..96beb20d 100644 --- a/src/logic/scripting/api_lua.cpp +++ b/src/logic/scripting/api_lua.cpp @@ -14,7 +14,7 @@ #include "../../lighting/Lighting.h" #include "../../logic/BlocksController.h" -#if (LUA_VERSION_NUM < 503 and not defined(LUAJIT_VERSION)) +#if (LUA_VERSION_NUM < 503 && !defined(LUAJIT_VERSION)) static void luaL_openlib(lua_State* L, const char* name, const luaL_Reg* libfuncs) { lua_newtable(L); luaL_setfuncs(L, libfuncs, 0); From 3473aeb3091d9df258ec8b9dba80499fb336b84f Mon Sep 17 00:00:00 2001 From: A-lex-Ra Date: Wed, 17 Jan 2024 19:26:09 +0600 Subject: [PATCH 2/2] replace target fix --- src/logic/PlayerController.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp index 253f5bda..7a84a96c 100644 --- a/src/logic/PlayerController.cpp +++ b/src/logic/PlayerController.cpp @@ -285,7 +285,7 @@ void PlayerController::updateInteraction(){ scripting::on_block_interact(player, target, x, y, z); return; } - if (target->model != BlockModel::xsprite){ + if (!target->replaceable){ x = (iend.x)+(norm.x); y = (iend.y)+(norm.y); z = (iend.z)+(norm.z);