flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,518 Commits 1 Branch 0 Tags 92 MiB
c86722325a
Commit Graph

195 Commits

Author SHA1 Message Date
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
Tiger Wang
72c087cfd3 Dropped support for <1.7.x 2014-09-27 14:28:14 +01:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
madmaxoft
82317709f8 Full BungeeCord compatibility. 
Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
 2014-09-17 11:07:42 +02:00
Howaner
b462416e1f 1.8: Fixed maps. 2014-09-13 02:20:04 +02:00
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Mattes D
c5cd75fae8 Exported cClientHandle:GetIPString() to Lua API. 2014-09-07 22:35:22 +02:00
Mattes D
c140ba2367 Merge pull request #1351 from LO1ZB/remove-a_RelY 
remove y-coord from chunks
 2014-09-03 21:47:00 +02:00
Hownaer
6c3b80f04c Fixed crashes and use std::swap. 2014-08-28 14:58:03 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
Howaner
4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. 
I need this for a GameRule plugin.
 2014-08-07 01:07:32 +02:00
Mattes D
941a182d8a Merge pull request #1255 from mc-server/NameToUUID 
Name to UUID
 2014-08-01 22:35:12 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner
89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
madmaxoft
17a94b16ea MojangAPI: Implemented UUID shortening and dashing. 2014-07-30 13:56:30 +02:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
tonibm19
997a643977 Moar view distance! 
Let's blow up our computers! :D
 2014-07-23 20:28:56 +02:00
archshift
4044d0a6e6 Export SendEntityAnimation to ToLua 2014-07-22 13:10:12 -07:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
Tiger Wang
719551c31f Fix failed merge and other issues 2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
madmaxoft
7fff12bfac Fixed spaces around single-line comments. 
There should be at least two spaces in front and one space after //-style comments.
 2014-07-17 19:13:23 +02:00
madmaxoft
993fd14ddf Fixed basic whitespace problems. 
Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
 2014-07-17 16:33:09 +02:00
Mattes D
e444106d09 Merge pull request #1192 from mc-server/skinuuid 
Skins
 2014-07-16 13:30:57 +02:00
Tiger Wang
1f6854792c Store properties as Json::Value 2014-07-16 00:03:47 +01:00
Tiger Wang
4e24f711ab Player properties are now retrieved 2014-07-14 19:49:31 +01:00
Howaner
d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Tiger Wang
e11f41d048 Revert failed fix for #31 
This reverts commit 69dc9b4c9a.
 2014-07-13 00:17:31 +01:00
Tiger Wang
b9d4431f6f Fixed respawning 
* Fixes #1103
 2014-06-29 22:44:16 +01:00
Mattes D
9926abd4f5 Added generic entity-collecting. 
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
 2014-06-27 20:56:44 +02:00
Tiger Wang
bd5df3d3b9 Merge branch 'master' of https://github.com/mc-server/MCServer into portals 2014-06-24 21:15:48 +01:00
madmaxoft
08fed2a213 Added cClientHandle::IsUUIDOnline function. 
Ref.: #771
 2014-06-21 22:13:35 +02:00
Tiger Wang
29567c5610 Portals animate and delay correctly 2014-06-12 15:21:07 +01:00
Mattes D
af4a21ea06 Fixed deadlock when moving players to other worlds. 
Fixes #1039, fixes #851
 2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d Added queue for adding entities to cWorld. 
This alone doesn't work properly yet, further changes to cPlayer are needed.
 2014-06-08 21:58:29 +02:00
madmaxoft
6449b5d11b Revert "Add more move checks" 
This reverts commit 989312c4e7.
 2014-05-26 16:38:39 +02:00
Mattes D
6ad411a8b8 Merge pull request #1003 from Howaner/GlobalFixes 
Add more move checks
 2014-05-26 10:14:05 +02:00
Tiger Wang
3a9543178a cCompositeChat message type is now formatted 2014-05-19 21:16:29 +01:00
Mattes D
ac00568183 Merge pull request #998 from mc-server/StatManager 
Statistic Manager
 2014-05-18 22:30:34 +02:00
Howaner
989312c4e7 Add more move checks 
- Invalid X/Y/Z/Stance check (std::isnan)
- Illegal stance
- Illegal position (32.000.000 is the world size)
 2014-05-16 22:04:19 +02:00
Mattes D
0e43f88668 Merge pull request #994 from Howaner/GlobalFixes 
Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
 2014-05-15 21:16:04 +02:00
andrew
c7c3724a3e Statistic Manager 2014-05-11 14:57:06 +03:00
Howaner
5c9f89526a Rename HandleBlockDigCancel to FinishDigAnimtion. 2014-05-11 11:56:15 +02:00
Mattes D
28815252e6 Merge branch 'master' into SslWebAdmin 2014-05-10 21:27:57 +02:00
Howaner
c8631d9a9b Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. 2014-05-09 23:10:02 +02:00
Howaner
6ac332cd06 Add MC|ItemName plugin message. 2014-05-05 17:34:24 +02:00
madmaxoft
6bdd3ee35e Merged branch 'master' into SslWebAdmin. 2014-05-01 23:20:00 +02:00
madmaxoft
e24bdc9328 More ClientHandle fixes. 2014-05-01 23:03:23 +02:00
madmaxoft
60850fe3e8 Fixed crashes in the SSL HTTP connection. 2014-05-01 15:08:15 +02:00
archshift
aef2c8ec62 Further refactored, Reverted Minecart change 
Other small changes.
 2014-04-26 09:25:30 -07:00
archshift
b008ba5d98 Refactored SendChat(), placing the message-type formatting into its own function. 
Removed default case warning in the process.
 2014-04-24 18:03:49 -07:00
daniel0916
f9343a8490 Modified many things 2014-04-17 13:15:35 +02:00
daniel0916
a0725747af Fixed conflicting enchantments checking 2014-04-16 14:52:09 +02:00
daniel0916
5a9acb7eb6 Merge branch 'master' into Enchanting 2014-04-16 14:31:02 +02:00
daniel0916
2cb8538e2e Code Optimization 2014-04-15 22:03:15 +02:00
daniel0916
fb3c755c0a Modified names 2014-04-15 20:55:37 +02:00
madmaxoft
d12d7b6715 Implemented the 1.7.6 protocol and authenticator. 
Server works both in online and offline modes with 1.7.9.
 2014-04-14 22:52:59 +02:00
madmaxoft
d505ffc704 A client UUID is generated when the server is in offline mode. 
1.7.9 client works with these changes in offline mode.
 2014-04-14 20:21:00 +02:00
daniel0916
fce9ea65c3 Fixed invisibility enchantments 2014-04-13 22:15:10 +02:00