diff options
| -rw-r--r-- | src/server/game/DataStores/DBCStructure.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/OutdoorPvP/OutdoorPvP.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Pools/PoolMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp | 12 |
5 files changed, 14 insertions, 5 deletions
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 1e6c8218489..a6bddc7bd5e 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1523,7 +1523,7 @@ struct ScalingStatValuesEntry uint32 getFeralBonus(uint32 mask) const // removed in 3.2.x? { - if (mask & 0x00010000) return 0; // not used? + //if (mask & 0x00010000) return 0; // not used? return 0; } }; diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 0a52c145122..4be3a03040d 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -492,6 +492,7 @@ void Object::BuildValuesUpdate(uint8 updateType, ByteBuffer* data, Player* targe uint32* flags = NULL; uint32 visibleFlag = GetUpdateFieldData(target, flags); + ASSERT(flags); for (uint16 index = 0; index < m_valuesCount; ++index) { diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 7c3f27e2acd..c8bc68d0ddf 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -508,7 +508,7 @@ bool OPvPCapturePoint::HandleCustomSpell(Player* player, uint32 /*spellId*/, Gam { if (!player->IsOutdoorPvPActive()) return false; - return false; + return true; } bool OutdoorPvP::HandleOpenGo(Player* player, ObjectGuid guid) diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp index d643bc5da41..3f561539917 100644 --- a/src/server/game/Pools/PoolMgr.cpp +++ b/src/server/game/Pools/PoolMgr.cpp @@ -170,7 +170,7 @@ PoolObject* PoolGroup<T>::RollOne(ActivePoolData& spawns, uint32 triggerFrom) } if (!EqualChanced.empty()) { - int32 index = irand(0, EqualChanced.size()-1); + uint32 index = urand(0, EqualChanced.size()-1); // Triggering object is marked as spawned at this time and can be also rolled (respawn case) // so this need explicit check for this case if (EqualChanced[index].guid == triggerFrom || !spawns.IsActiveObject<T>(EqualChanced[index].guid)) diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 99342b5a628..ab2e82171f1 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -361,7 +361,10 @@ public: struct npc_demolitionist_legosoAI : public npc_escortAI { - npc_demolitionist_legosoAI(Creature* creature) : npc_escortAI(creature) { } + npc_demolitionist_legosoAI(Creature* creature) : npc_escortAI(creature) + { + Initialize(); + } void sQuestAccept(Player* player, Quest const* quest) override { @@ -395,11 +398,16 @@ public: } } - void Reset() override + void Initialize() { _phase = PHASE_NONE; _moveTimer = 0; _eventStarterGuidLow = 0; + } + + void Reset() override + { + Initialize(); me->SetCanDualWield(true); _events.Reset(); |