Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/DataStores/DBCEnums.h src/server/scripts/Commands/cs_wp.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
This commit is contained in:
commit
07024d3ea8
31 files changed
+3139
-1933
No files matched your search
@@ -924,7 +924,7 @@ public:
|
||||
if (!ve)
|
||||
return false;
|
||||
|
||||
Creature* v = new Creature;
|
||||
Creature* v = new Creature();
|
||||
|
||||
Map* map = handler->GetSession()->GetPlayer()->GetMap();
|
||||
|
||||
|
||||
Reference in new issue
Block a user