Mattes D
19d463ae1c
Fixed a deadlock in cClientHandle network sending.
2015-01-27 14:53:38 +01:00
Mattes D
4eecf9363a
Client: Only decode protocol when there's actual data incoming.
2015-01-27 14:53:36 +01:00
Mattes D
edce2cbdcf
Fixed enchant packet handling.
2015-01-27 14:53:34 +01:00
Mattes D
7dfeb67f01
Converted cServer to use the cNetwork API.
2015-01-27 14:53:31 +01:00
Mattes D
5ac3a23586
Fixed warnings in 1.7 protocol.
2015-01-18 22:43:35 +01:00
Mattes D
ccdf03daaf
Refactored all player block placing to go through hooks.
...
Fixes #1618 .
2014-12-24 07:20:17 +01:00
Mattes D
33c6ff872e
Cosmetic touchups.
...
Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files.
2014-12-11 14:34:09 +01:00
Mattes D
32bce44f1f
Merge pull request #1623 from p-mcgowan/issue_1253
...
Prevent multiple logins with same username, unless allowed in settings
2014-12-10 11:17:11 +01:00
Vincent
9bba8e4c7d
Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin()
...
Compiles correctly.
2014-12-10 00:45:24 -08:00
Vincent
3a2759fdc1
Fixed return value in CheckMultiLogin()
2014-12-09 14:23:44 -08:00
Vincent
4b08ca261b
Fixed indent problems and added return definitions to CheckMultiLogin().
...
Changed from IsAllowMultiLogin() to DoesAllowMultiLogin().
Fixed CheckMultiLogin() to not run to the end without returning a value.
2014-12-09 03:06:25 -08:00
Vincent
12c012fa01
Changed CheckMultiLogin() to not have main body wrapped in an if statement.
...
Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin().
Added doxy-comment for DoWithPlayer().
Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments.
2014-12-08 14:33:59 -08:00
Vincent
e28cc876c4
created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World.
2014-12-08 00:57:46 -08:00
Vincent
6de07d4a39
Fixed compile errors
2014-12-08 00:45:29 -08:00
Vincent
656964dc38
removed last space in handlehandshake
2014-12-08 00:19:33 -08:00
Vincent
ed09e76023
Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player.
2014-12-08 00:16:09 -08:00
Vincent
d8d3b9aec5
Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added.
2014-12-08 00:12:48 -08:00
Vincent
83c728fce4
Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253
2014-12-07 12:45:39 -08:00
Vincent
8edfd78295
changed from using iterator to auto for server and clienthandle
2014-12-07 12:41:42 -08:00
Mattes D
3c3cb198f3
Fixed c++11 branch issues.
2014-12-07 15:46:27 +01:00
Tiger Wang
3acdf25b05
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
Mattes D
e2a04f580a
BasicStyle: Added missing braces to control statements.
2014-12-05 16:59:11 +01:00
Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
vincentleung1
438a9b04cb
Changed Kick message
2014-11-29 16:05:22 -08:00
vincentleung1
9caa3b19c1
removed extra space and fixed some formatting in cCallback
2014-11-29 15:59:48 -08:00
Vincent
72797b14fe
Uses callback for players already in World.
2014-11-29 15:44:38 -08:00
Vincent
a7bf2725c8
fixed naming of strings and changed from i to I
2014-11-29 11:22:03 -08:00
Vincent
61e761fdc2
issue 1253 - prevent multiple logins with same username
2014-11-29 00:36:15 -08:00
Mattes D
c1a52dc9fb
ClientHandle: Fixed max block place distance check.
...
Fixes #1492
2014-11-25 21:24:25 +01:00
Tiger Wang
79e5b82354
Merge remote-tracking branch 'origin/master' into c++11
...
Conflicts:
src/Noise/Noise.h
src/World.h
2014-11-23 17:12:34 +00:00
Mattes D
9ece37e8f1
Merge pull request #1598 from mc-server/SignEditor
...
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00
Mattes D
ae15c2f78e
Fixed a wrong assert in cClientHandle::SetViewDistance().
2014-11-17 12:34:14 +01:00
Howaner
277151582f
Use LastPlacedSign instead of LastPlacedBlock.
2014-11-15 22:36:31 +01:00
Howaner
09cea625fc
Renamed m_UsedViewDistance to m_CurrentViewDistance
2014-11-15 22:26:54 +01:00
Howaner
927d8d7702
Renamed m_SetViewDistance to m_RequestedViewDistance
2014-11-15 15:33:42 +01:00
Howaner
78fb789631
Fixed a security problem with signs.
2014-11-15 15:16:52 +01:00
Howaner
83d3f3347b
Use m_UsedViewDistance and m_SetViewDistance.
2014-11-14 22:53:12 +01:00
Howaner
a0e1e43fc1
Merge branch 'master' into ViewDistance
2014-11-14 22:33:54 +01:00
Howaner
d93acb841f
Fixed m_SentChunks list chunk removing.
2014-10-30 22:04:04 +01:00
Howaner
9c7661f50f
Added a MaxViewDistance option.
2014-10-30 21:24:10 +01:00
Mattes D
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
Howaner
9af58a81d6
Use 3 priorities.
2014-10-23 21:19:43 +02:00
Howaner
72bb299a4a
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ChunkSender.cpp
src/ClientHandle.cpp
src/World.h
2014-10-23 14:59:42 +02:00
Tiger Wang
a26541a7c3
En masse NULL -> nullptr replace
2014-10-22 20:12:49 -07:00
Howaner
b0988e65aa
Use two lists and 2 chunk send prioritys.
2014-10-21 17:35:23 +02:00
Howaner
a07456d712
New c++11 stuff.
2014-10-21 17:00:41 +02:00
Howaner
44514e53fc
Merge branch 'master' into ChunkLoader
...
Conflicts:
src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang
987f79afdd
En masse NULL -> nullptr replace
2014-10-20 21:55:07 +01:00
Tiger Wang
bde99d684e
Migrated cSleep and cTimer to std::chrono
2014-10-20 18:59:40 +01:00
Tiger Wang
aa19a3afb0
Migrated random generators to std::random
2014-10-19 14:10:18 +01:00
