From 8edf9440a34b433a3ae2bac1703cd159eae66d66 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 10 Jul 2024 06:51:14 +0300
Subject: [PATCH] reduce redundancy

---
 src/content/ContentLoader.cpp     | 2 +-
 src/logic/scripting/scripting.cpp | 4 ++--
 src/logic/scripting/scripting.hpp | 1 -
 src/objects/Entities.cpp          | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index cdfec691..ff2dfb91 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -359,7 +359,7 @@ void ContentLoader::loadEntity(EntityDef& def, const std::string& full, const st
     for (auto& componentName : def.components) {
         auto scriptfile = folder/fs::path("scripts/components/"+componentName+".lua");
         if (fs::is_regular_file(scriptfile)) {
-            scripting::load_entity_component(env, componentName, scriptfile);
+            scripting::load_entity_component(componentName, scriptfile);
         }
     }
 }
diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp
index 692a6cf8..bc159584 100644
--- a/src/logic/scripting/scripting.cpp
+++ b/src/logic/scripting/scripting.cpp
@@ -514,11 +514,11 @@ void scripting::load_item_script(const scriptenv& senv, const std::string& prefi
     funcsset.on_block_break_by = register_event(env, "on_block_break_by", prefix+".blockbreakby");
 }
 
-void scripting::load_entity_component(const scriptenv& penv, const std::string& name, const fs::path& file) {
+void scripting::load_entity_component(const std::string& name, const fs::path& file) {
     auto L = lua::get_main_thread();
     std::string src = files::read_string(file);
     logger.info() << "script (component) " << file.u8string();
-    lua::loadbuffer(L, *penv, src, file.u8string());
+    lua::loadbuffer(L, 0, src, file.u8string());
     lua::store_in(L, lua::CHUNKS_TABLE, name);
 }
 
diff --git a/src/logic/scripting/scripting.hpp b/src/logic/scripting/scripting.hpp
index d3e2354b..50849f66 100644
--- a/src/logic/scripting/scripting.hpp
+++ b/src/logic/scripting/scripting.hpp
@@ -127,7 +127,6 @@ namespace scripting {
         item_funcs_set& funcsset);
 
     void load_entity_component(
-        const scriptenv& env,
         const std::string& name,
         const fs::path& file);
     
diff --git a/src/objects/Entities.cpp b/src/objects/Entities.cpp
index 4c8f5871..ae8b5ddc 100644
--- a/src/objects/Entities.cpp
+++ b/src/objects/Entities.cpp
@@ -405,8 +405,8 @@ void Entities::render(Assets* assets, ModelBatch& batch, const Frustum& frustum,
 }
 
 bool Entities::hasBlockingInside(AABB aabb) {
-    auto view = registry.view<EntityId, Transform, Rigidbody>();
-    for (auto [entity, eid, transform, body] : view.each()) {
+    auto view = registry.view<EntityId, Rigidbody>();
+    for (auto [entity, eid, body] : view.each()) {
         if (eid.def.blocking && aabb.intersect(body.hitbox.getAABB())) {
             return true;
         }