From a69dab361112ff069f4059add5f3c3a441cf09d8 Mon Sep 17 00:00:00 2001
From: Jiga228 <danilkorshikov80@mail.ru>
Date: Sun, 28 Jun 2026 19:59:54 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=B2=D1=8B=D0=B1=D0=B8=D1=80=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=20=D0=B4?=
 =?UTF-8?q?=D0=BB=D1=8F=20GetActorsByClass?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Core/Game/World/World.cpp | 2 +-
 Core/Game/World/World.hpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/Game/World/World.cpp b/Core/Game/World/World.cpp
index fe282a9..eaf344c 100644
--- a/Core/Game/World/World.cpp
+++ b/Core/Game/World/World.cpp
@@ -61,7 +61,7 @@ void World::load(std::shared_ptr<SaveMap> save)
 void World::DestroyActor(std::weak_ptr<Actor> ptr)
 {
     std::shared_ptr<Actor> actor = ptr.lock();
-    if (actor.get() == nullptr)
+    if (actor == nullptr)
         return;
     
     std::string name = actor->GetName();
diff --git a/Core/Game/World/World.hpp b/Core/Game/World/World.hpp
index f452e06..029736a 100644
--- a/Core/Game/World/World.hpp
+++ b/Core/Game/World/World.hpp
@@ -31,10 +31,10 @@ public:
     void load(std::shared_ptr<SaveMap> save) override;
 #pragma endregion
     
-    template<class T>
-    std::vector<std::weak_ptr<T>> GetActorsByClass()
+    template<class T, class Container = std::vector<std::weak_ptr<T>>>
+    Container GetActorsByClass()
     {
-        std::vector<std::weak_ptr<T>> list;
+        Container list;
         for (auto i = actors_map.cbegin(); i != actors_map.cend(); ++i)
         {
             if (RTTI::dyn_cast<T, Actor>(i->second.get()))