flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,022 Commits 1 Branch 0 Tags 92 MiB
4f75b94c99
Commit Graph

334 Commits

Author SHA1 Message Date
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
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
madmaxoft
5a44be13b7 Fixed trailing whitespace. 2014-09-28 22:17:29 +02:00
Mattes D
8d55cd409e Merge pull request #1466 from mc-server/endofsupport 
Removed protocols 1.2 to 1.6
 2014-09-28 22:04:30 +02:00
Masy98
79110b29db Combined conditions 2014-09-27 21:49:03 +02:00
Masy98
fc22ba0ce8 Added barriers correctly 2014-09-27 21:07:52 +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
4b38e077cf Merge branch 'master' into EntityCustomName 
Conflicts:
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/World.cpp
	src/World.h
 2014-09-23 14:39:49 +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
010879e43f BungeeCord compatibility: don't overwrite UUID / properties. 2014-09-17 16:01:14 +02:00
Howaner
92e7e5c615 Merge branch 'master' into 1.8-Protocol 2014-09-14 14:16:17 +02:00
Mattes D
5b63a7fe98 Merge pull request #1353 from mc-server/Effects 
Added speed entity effect.
 2014-09-13 17:05:59 +02:00
Howaner
b462416e1f 1.8: Fixed maps. 2014-09-13 02:20:04 +02:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol 
Conflicts:
	src/Items/ItemHoe.h
 2014-09-13 01:21:43 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Howaner
20f3757d54 Play placesound from the middle of the block. 2014-09-12 18:14:32 +02:00
Howaner
010ac1e5f7 Fixed block place sounds. 2014-09-12 18:12:42 +02:00
Howaner
a1716bb415 Players in survival mode are not allowed to break a bedrock. 2014-09-12 15:57:37 +02:00
Howaner
bee615b75b Merge branch 'master' into 1.8-Protocol 2014-09-12 13:28:06 +02:00
Howaner
f2c5d8a761 Fixed many right click issues. 2014-09-12 13:19:33 +02:00
Howaner
4e2d75bde5 1.8: Fixed eating. 2014-09-12 01:37:19 +02:00
Howaner
3bd3ac2200 1.8: Added ParticleEffect packet. 2014-09-11 17:03:09 +02:00
Howaner
71c3369e08 1.8: Added MultiBlockChange packet. 2014-09-09 18:27:31 +02:00
Masy98
acae3c9c65 Moved sound-configs into BlockID.h and fixed/ added loads of sounds 2014-09-09 16:00:26 +02:00
Howaner
f94df06b66 Added the player list to the 1.8 protocol. 2014-09-09 03:02:25 +02:00
Howaner
6fb0a76b1e Merge branch 'master' into 1.8-Protocol 2014-09-09 01:55:21 +02:00
Howaner
4b1f4e8d7e 1.8: Added new uuid field. 2014-09-09 01:52:51 +02:00
Howaner
76fa3a7ccd More fixes. 2014-09-08 20:12:43 +02:00
Howaner
8f8693a71e Fixed more 1.8 packets. 2014-09-08 17:02:54 +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
Howaner
e431bb4e63 Merge branch 'master' into Inventory 2014-09-02 20:11:38 +02:00
Howaner
1bb4d79412 Added SetCustomName() to players. 2014-09-02 19:12:35 +02:00
Hownaer
240ec9b4bd Added speed entity effect. 2014-08-28 23:02:20 +02:00
Hownaer
4470ebffd7 Fire can be destroyed with the sword in creative-mode 2014-08-28 20:49:34 +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
8fa4ac9ad9 Fixed item drop. 
Fixes #1341
 2014-08-22 15:32:27 +02:00
Mattes D
64fec204c4 Added initializers for class members. 
As reported by Coverity, these weren't initialized.
 2014-08-21 22:39:53 +02:00
Howaner
f7774ec336 Merge branch 'master' into Fire 2014-08-20 22:25:05 +02:00
Howaner
cb98014582 Revert "Removes the fire if the block under the fire was broken." 
This reverts commit 01001d2a49.
 2014-08-11 23:12:32 +02:00
Howaner
01001d2a49 Removes the fire if the block under the fire was broken. 2014-08-11 22:37:28 +02:00
Howaner
74fabb079c Moved the clicked-through block check to the top of the function. 2014-08-11 22:34:33 +02:00
Howaner
202a0d1c1d Fixed cancelled fire interact from all directions. 2014-08-11 14:24:36 +02:00
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
Howaner
42bad0edec Added a comment and simplified code. 2014-08-10 20:06:03 +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
Howaner
ff7171fc5a Resending fire to the client when the interact cancelled. 2014-08-06 14:04:25 +02:00
Howaner
3b4255dbfe Fixed a bug who can used from hacked clients. 2014-08-02 00:14:05 +02:00
Mattes D
941a182d8a Merge pull request #1255 from mc-server/NameToUUID 
Name to UUID
 2014-08-01 22:35:12 +02:00
Mattes D
d2744713bb Merge pull request #1272 from Howaner/Food 
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
 2014-08-01 17:43:18 +02:00
Howaner
86d84bcb73 Compile fix. 2014-08-01 17:29:17 +02:00
Howaner
160fa3a9a9 Import Statistics.h 2014-07-31 23:56:49 +02:00
madmaxoft
6d02fce9a2 Merged branch 'master' into NameToUUID. 2014-07-31 23:17:49 +02:00
Howaner
84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
Howaner
6b1f7e7a45 Renamed "select..." methods to "set..." and better IsValidEffect() function. 2014-07-31 18:15:39 +02:00
Howaner
556fc908ae Renamed functions and added beacon json saving. 2014-07-31 12:13:11 +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
madmaxoft
f095e770b8 Merged branch 'howaner/Options'. 2014-07-30 10:06:18 +02:00
Tiger Wang
4f5d73b770 Slight cleanup after portals 2014-07-29 20:50:30 +01:00
Howaner
7f9f46c911 Fixed group color's. 2014-07-27 13:47:21 +02:00
Tiger Wang
1156914dd6 Suggestions 2014-07-23 21:12:59 +01: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
6ab9afd0fd Bug and crash fixes 
* Fixes end portals' solidity
* Fixed crashes to do with multithreading and removing an entity from
the wrong world
* Fixed crashes due to bad merge
* Fixed crashes due to an object being deleted twice
* Simplified cWorld::Start() and added comments to configuration files
 2014-07-20 10:46:45 +01:00
archshift
52add840cf Fixed attempts to call c_str on ChatColors 2014-07-19 11:15:21 -07:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +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
archshift
9529a42559 Fixed creative players not being able to drink 
Fixes #1215
 2014-07-18 01:56:26 -07:00
madmaxoft
2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02: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
madmaxoft
e66b81b395 Merge remote-tracking branch 'origin/master' into potions 2014-07-17 10:06:13 +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
madmaxoft
8e946da8ac Merge branch 'master' into potions 2014-07-15 09:01:32 +02: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
archshift
e824cd09b3 Merge remote-tracking branch 'origin/master' into potions 
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
 2014-07-09 23:28:27 -07:00
Howaner
4ded58bfd1 Unnecessary return 2014-06-30 14:19:31 +02:00
Tiger Wang
b9d4431f6f Fixed respawning 
* Fixes #1103
 2014-06-29 22:44:16 +01:00
Mattes D
3c631fc0f9 Fixed offline UUID generator. 
It generated invalid UUIDs, too many hex chars.
 2014-06-29 18:27:41 +02:00
Howaner
50e112788b Send statistics to the player, when he logged in. 2014-06-29 01:40:15 +02:00
Mattes D
1b89b997ff Merge pull request #1132 from mc-server/RemoveMD5 
Removed the md5 library, obsoleted by PolarSSL.
 2014-06-29 00:46:11 +02:00
Tiger Wang
5e66d9aeab Fixed issue with breaking blocks at -1 coordinates 2014-06-28 20:45:05 +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
Mattes D
563f706422 Removed the md5 library, obsoleted by PolarSSL. 
Fixes #1130.
 2014-06-27 19:34:53 +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
Tiger Wang
7615ed90c0 Merge branch 'master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h
 2014-06-21 22:14:23 +01:00
madmaxoft
08fed2a213 Added cClientHandle::IsUUIDOnline function. 
Ref.: #771
 2014-06-21 22:13:35 +02:00
archshift
3766ac96d7 ItemHandler: changed IsDrinkable() to take a short argument 2014-06-17 11:39:20 -07:00