diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2017-06-02 03:24:27 -0300 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2020-06-14 23:49:05 +0200 |
| commit | 3cf5db1831e0533627e6a5b78dd6bf406ccfab3f (patch) | |
| tree | f4e096a546aa3e47b31eb7a218924b787d5948eb /src/server/shared/Dynamic | |
| parent | e50a95839c3b59b286a877b4eda576c5016a4903 (diff) | |
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
(cherry picked from commit d56a28afee19741c582ed8e16dbf8e30311f68ea)
Diffstat (limited to 'src/server/shared/Dynamic')
| -rw-r--r-- | src/server/shared/Dynamic/FactoryHolder.h | 1 | ||||
| -rw-r--r-- | src/server/shared/Dynamic/ObjectRegistry.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h index 32c4343e503..317d50ea9fc 100644 --- a/src/server/shared/Dynamic/FactoryHolder.h +++ b/src/server/shared/Dynamic/FactoryHolder.h @@ -32,7 +32,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 89ca33f15fa..973c34fda24 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -63,6 +63,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 { |