Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
# Conflicts: # src/server/game/Entities/Player/Player.cpp # src/server/game/Maps/Map.cpp # src/server/game/Maps/Map.h
This commit is contained in:
commit
617b3a8a11
172 files changed
+4534
-1342
No files matched your search
@@ -27,6 +27,7 @@
|
||||
#include "Map.h"
|
||||
#include "Player.h"
|
||||
#include "Pet.h"
|
||||
#include "PhasingHandler.h"
|
||||
#include "WorldSession.h"
|
||||
#include "Opcodes.h"
|
||||
#include "Guild.h"
|
||||
@@ -749,7 +750,7 @@ void InstanceScript::UpdatePhasing()
|
||||
Map::PlayerList const& players = instance->GetPlayers();
|
||||
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
|
||||
if (Player* player = itr->GetSource())
|
||||
player->SendUpdatePhasing();
|
||||
PhasingHandler::SendToPlayer(player);
|
||||
}
|
||||
|
||||
void InstanceScript::UpdateCombatResurrection(uint32 diff)
|
||||
|
||||
Reference in new issue
Block a user