From 8d44908b4bf18725defdaad5ec75ab6d444fc787 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 24 Mar 2016 21:52:27 +0000 Subject: [PATCH] this seems to have been test code...we can reenable if something feels missing later --- .../serverGame/src/shared/object/BuildingObject.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp index ab3d5d40..9ba696a0 100755 --- a/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/BuildingObject.cpp @@ -608,19 +608,11 @@ bool BuildingObject::isAllowed(CreatureObject const &who) const // allow non-player-controlled creatures in private buildings with no owner if (!who.isPlayerControlled() && getOwnerId() == NetworkId::cms_invalid) return true; + // allow vendor-creatures to be placed in the building if (who.hasCondition(static_cast(ServerTangibleObjectTemplate::C_vendor))) return true; - // allow non-player-controlled creatures in private buildings if the *creature* has no owner - if (!who.isPlayerControlled() - && who.getMasterId() == NetworkId::cms_invalid - && who.getLevel() < 10 // temp change to < 0 after testing holo item - ) - { - return true; - } - return CellPermissions::isOnList(m_allowed.get(), who); } }