summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorStoabrogga <38475780+Stoabrogga@users.noreply.github.com>2019-09-04 16:43:44 +0200
committerGitHub <noreply@github.com>2019-09-04 16:43:44 +0200
commitdbfa66c698d1e9d3dfa7e710c443a96c389e7fff (patch)
tree9f04ddfcfe0cdd1e4ea54146d68f5b32dcaaf410 /src/server
parent213148f634a45c41565e131a6d521bf3e3034105 (diff)
fix(DB/Core): "Sons of Hodir" quests / areas (#2231)
Diffstat (limited to 'src/server')
-rw-r--r--src/server/game/Entities/Vehicle/Vehicle.cpp2
-rw-r--r--src/server/game/Handlers/ItemHandler.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
index 4d17c128ee..9acd913c65 100644
--- a/src/server/game/Entities/Vehicle/Vehicle.cpp
+++ b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -93,7 +93,7 @@ void Vehicle::InstallAllAccessories(bool evading)
void Vehicle::Uninstall()
{
/// @Prevent recursive uninstall call. (Bad script in OnUninstall/OnRemovePassenger/PassengerBoarded hook.)
- if (_status == STATUS_UNINSTALLING)
+ if (_status == STATUS_UNINSTALLING && !GetBase()->HasUnitTypeMask(UNIT_MASK_MINION))
{
sLog->outError("Vehicle GuidLow: %u, Entry: %u attempts to uninstall, but already has STATUS_UNINSTALLING! "
"Check Uninstall/PassengerBoarded script hooks for errors.", _me->GetGUIDLow(), _me->GetEntry());
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp
index 676470ff90..6eb79bb4d4 100644
--- a/src/server/game/Handlers/ItemHandler.cpp
+++ b/src/server/game/Handlers/ItemHandler.cpp
@@ -940,7 +940,9 @@ void WorldSession::SendListInventory(uint64 vendorGuid)
ConditionList conditions = sConditionMgr->GetConditionsForNpcVendorEvent(vendor->GetEntry(), item->item);
if (!sConditionMgr->IsObjectMeetToConditions(_player, vendor, conditions))
{
- sLog->outError("SendListInventory: conditions not met for creature entry %u item %u", vendor->GetEntry(), item->item);
+#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
+ sLog->outDebug("SendListInventory: conditions not met for creature entry %u item %u", vendor->GetEntry(), item->item);
+#endif
continue;
}