From 35113777de3e9f250e15b37067f3cc4945d8969f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Mon, 27 Jul 2026 21:31:48 +0300
Subject: [PATCH] add 'nonselect_entities' raycast parameter

---
 src/logic/scripting/lua/libs/libentity.cpp | 4 ++++
 src/objects/Entities.cpp                   | 3 ++-
 src/objects/Entities.hpp                   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/logic/scripting/lua/libs/libentity.cpp b/src/logic/scripting/lua/libs/libentity.cpp
index 110aee123..4434136ba 100644
--- a/src/logic/scripting/lua/libs/libentity.cpp
+++ b/src/logic/scripting/lua/libs/libentity.cpp
@@ -311,6 +311,10 @@ static int l_world_raycast(lua::State* L) {
         entityRaycast.entityFilterExcludeMode = lua::toboolean(L, -1);
         lua::pop(L);
     }
+    if (lua::getfield(L, "nonselect_entities", 1)) {
+        entityRaycast.includeNonSelectable = lua::toboolean(L, -1);
+        lua::pop(L);
+    }
     if (lua::getfield(L, "filter_blocks", 1)) {
         load_blocks_filter(L, -1, filteredBlocks);
         blocksRaycast.filter = &filteredBlocks;
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index f0e3e5340..0902ae85a 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -176,7 +176,8 @@ std::optional<Entities::RaycastResult> Entities::rayCast(
 
     for (auto [entity, eid, transform, body] : view.each()) {
         if (eid.uid == settings.ignoredUid || !body.enabled ||
-            (settings.solidEntitiesOnly && !eid.def.solid) || !eid.def.selectable) {
+            (settings.solidEntitiesOnly && !eid.def.solid) ||
+            (!eid.def.selectable && !settings.includeNonSelectable)) {
             continue;
         }
         if (settings.entitiesFilter) {
diff --git a/src/objects/Entities.hpp b/src/objects/Entities.hpp
index 0d003ffb1..382790b95 100644
--- a/src/objects/Entities.hpp
+++ b/src/objects/Entities.hpp
@@ -85,6 +85,7 @@ public:
         bool solidEntitiesOnly = false;
         bool entityFilterExcludeMode = false;
         const std::set<entitydefid_t>* entitiesFilter = nullptr;
+        bool includeNonSelectable = false;
     };
 
     struct RaycastResult {