From d56a28afee19741c582ed8e16dbf8e30311f68ea Mon Sep 17 00:00:00 2001
From: ariel- <ariel-@users.noreply.github.com>
Date: Fri, 2 Jun 2017 03:24:27 -0300
Subject: Core/Globals: add more AIName and MovementType checks to ObjectMgr

- Ninja fix AI factories (restores prev behaviour of not selecting stuff with PERMIT_BASE_NO)

Closes #19831
---
 src/server/shared/Dynamic/FactoryHolder.h  | 1 -
 src/server/shared/Dynamic/ObjectRegistry.h | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/server/shared/Dynamic')

diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h
index ec4a6908133..9c9e2ada5e0 100644
--- a/src/server/shared/Dynamic/FactoryHolder.h
+++ b/src/server/shared/Dynamic/FactoryHolder.h
@@ -33,7 +33,6 @@ class FactoryHolder
 
         explicit FactoryHolder(Key const& k) : _key(k) { }
         virtual ~FactoryHolder() { }
-        inline Key GetKey() const { return _key; }
 
         void RegisterSelf() { FactoryHolderRegistry::instance()->InsertItem(this, _key); }
 
diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h
index 21f561bdd36..5f614819b13 100644
--- a/src/server/shared/Dynamic/ObjectRegistry.h
+++ b/src/server/shared/Dynamic/ObjectRegistry.h
@@ -64,6 +64,12 @@ class ObjectRegistry final
             return true;
         }
 
+        /// Returns true if registry contains an item
+        bool HasItem(Key const& key) const
+        {
+            return (_registeredObjects.count(key) > 0);
+        }
+
         /// Return the map of registered items
         RegistryMapType const& GetRegisteredItems() const
         {
-- 
cgit v1.2.3