1
0
Fork 0
Commit Graph

158 Commits

Author SHA1 Message Date
Mattes D 6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney 804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Tiger Wang 8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
worktycho 106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing
Chunk queue collapsing: MK II
2015-07-04 14:43:00 +01:00
tycho 257011b440 use atomic for state, to avoid torn reads 2015-06-27 12:10:24 +01:00
Tiger Wang dd4b415051 Reinstate "Chunk queue collapsing"
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
2015-06-10 15:16:05 +01:00
worktycho adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
tycho 9ebbe969c8 Made the list of chunks to stream an unordered_set
This should increase performance of chunk streaming
2015-06-05 22:31:22 +01:00
jan64 d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D c3c30a78e1 Merge pull request #1848 from scottwillmoore/ImplementTitleCommand
Implement backend for /title command
2015-05-26 08:46:16 +02:00
Mattes D c13b1931ff More style checking.
Spaces around some operators are checked.
2015-05-09 12:58:54 +02:00
tycho 448df85e56 Added support for additional data in the ParticleEffect Packet
Also started refactoring how broadcasts are handled
2015-05-07 03:47:46 +01:00
Scott Moore 8c144207dc Implement backend for /title command 2015-04-13 16:22:51 +10:00
Mattes D c3c29577a5 Fixed signedness warnings in Protocol. 2015-03-21 16:11:57 +01:00
Mattes D 3923e3e37a Fixed signedness issues in protocols. 2015-03-21 15:40:56 +01:00
Mattes D b1d4b3bb96 Unified cByteBuffer types.
cByteBuffer now reads and writes any of the [U]Int<N> types.
2015-03-21 13:00:20 +01:00
Mattes D 19d463ae1c Fixed a deadlock in cClientHandle network sending. 2015-01-27 14:53:38 +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 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 6de07d4a39 Fixed compile errors 2014-12-08 00:45:29 -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
Mattes D 3c3cb198f3 Fixed c++11 branch issues. 2014-12-07 15:46:27 +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
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 8c3c11d6b3 Renamed GetSettedViewDistance() to GetRequestedViewDistance() 2014-11-15 14:27:50 +01:00
Howaner 83d3f3347b Use m_UsedViewDistance and m_SetViewDistance. 2014-11-14 22:53:12 +01:00
Mattes D 765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Howaner 44514e53fc Merge branch 'master' into ChunkLoader
Conflicts:
	src/ClientHandle.cpp
2014-10-21 16:55:22 +02:00
Tiger Wang 2334c8dd9d Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-20 19:01:53 +01:00
Tiger Wang bde99d684e Migrated cSleep and cTimer to std::chrono 2014-10-20 18:59:40 +01:00
Mattes D cf73fee7e3 Fixed minor style issues. 2014-10-19 18:45:42 +02:00
Tiger Wang 2874bf73be Merge pull request #1502 from mc-server/furnaces
Improved furnaces
2014-10-18 21:33:55 +01:00
Mattes D 8c2a99711e Merged branch 'fix_chunks'. 2014-10-16 21:12:26 +02:00
Howaner b493beb3bb Stream 4 chunks per tick. Added priority. 2014-10-06 21:27:53 +02:00
Howaner a59f2d15fb Merge branch 'master' into ChunkLoader 2014-10-06 17:38:42 +02:00
Howaner 5a6b86180e Better StreamNextChunk() method 2014-10-06 17:38:17 +02:00
Mattes D a8aeceab9d cClientHandle: Added protocol version knowledge. 2014-10-05 20:19:21 +02:00
Tiger Wang b5a2c6667a Improved furnaces
* Fixed progress bar on 1.8
* Fixed bugs
* Improved code
* Fixes #1068
* Fixes #1070
2014-10-03 21:32:41 +01:00
Howaner 382e014ebc Optimized chunk loader 2014-10-02 23:50:41 +02:00
madmaxoft e65e0f1795 cClientHandle: Alpha-sorted the sending functions. 2014-10-01 12:14:38 +02:00
madmaxoft d7066f43d3 Rewritten plugin messages, vanilla are being parsed directly.
This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages.
2014-09-30 13:33:57 +02:00