diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-27 20:59:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-27 20:59:22 +0200 |
| commit | 2cba07d6a1e319fec6d763daa69af3e29ba837c4 (patch) | |
| tree | 990d4a22193c066fa9aa20a7c33b4330e9a60086 /src/server/worldserver | |
| parent | 55eafa247d91e24bd59a369daa05b05d20334791 (diff) | |
| parent | e502e01f5d16964e67685c956e204ae41b756d26 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
README.md
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Updates/UpdateData.h
src/server/game/Server/WorldPacket.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index fcb4010075f..ce512628e98 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -196,11 +196,10 @@ Compression = 1 # Description: Maximum number of players in the world. Excluding Mods, GMs and Admins. # Important: If you want to block players and only allow Mods, GMs or Admins to join the # server, use the DB field "auth.realmlist.allowedSecurityLevel". -# Default: 100 - (Enabled) +# Default: 0 - (Disabled, No limit) # 1+ - (Enabled) -# 0 - (Disabled, No limit) -PlayerLimit = 100 +PlayerLimit = 0 # # SaveRespawnTimeImmediately |