Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/scripts/Spells/spell_paladin.cpp
This commit is contained in:
commit
83c2e79d52
19 files changed
+221
-204
No files matched your search
@@ -788,6 +788,7 @@ void WorldSession::HandlePlayerLoginOpcode(WorldPacket& recvData)
|
||||
if (PlayerLoading() || GetPlayer() != NULL)
|
||||
{
|
||||
TC_LOG_ERROR("network", "Player tries to login again, AccountId = %d", GetAccountId());
|
||||
KickPlayer();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user