flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
7,256 Commits 1 Branch 0 Tags 92 MiB
9083689040
Commit Graph

3324 Commits

Author SHA1 Message Date
Masy98
2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +02:00
tycho
ad5d0eda9c Fixed issue with casting 2014-09-26 17:00:34 +01:00
Howaner
d83d6456e8 Fixed players custom name in 1.8 2014-09-26 17:37:19 +02:00
Tycho
6ffb7835e7 Removed a few unnessicary includes 2014-09-26 16:26:03 +01:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests 
Added test mocking to IncrementalRedstoneSimulator
 2014-09-26 16:04:26 +01:00
Howaner
749c6092d3 Added type checking to map loading. 2014-09-26 14:31:52 +02:00
madmaxoft
157cad9007 Improved searching for spawn. 
Won't spawn on a small island inside ocean anymore.
 2014-09-26 13:04:34 +02:00
madmaxoft
6b260f06ba cByteBuffer: Simplified ReadPosition(). 
Also, by popular demand, added more comments to the code.
 2014-09-25 23:06:21 +02:00
madmaxoft
976c6bd32b Protocol 1.8: Fixed plugin message packet. 2014-09-25 21:33:20 +02:00
madmaxoft
0443f5d531 cByteBuffer: Fixed position reading. 2014-09-25 21:23:05 +02:00
madmaxoft
e5293706de TwoLevel BioGen: reads params from INI file. 2014-09-25 20:47:29 +02:00
madmaxoft
8f4cc27e39 Added cByteBuffer::WriteBEUShort(). 2014-09-25 20:47:29 +02:00
Mattes D
e751f4ffe3 Merge pull request #1452 from Howaner/Fixes 
Fixes
 2014-09-25 20:45:54 +02:00
madmaxoft
27187371eb Protocol 1.8: Handling packet compression properly. 
The compression didn't work with CommLog turned on.
 2014-09-25 20:34:49 +02:00
madmaxoft
3459bc1ede Protocol 1.8: Added checks for values presence. 
Reported by @worktycho / Coverity.
 2014-09-25 19:42:35 +02:00
Howaner
050b28741b Comment style 2014-09-25 19:28:11 +02:00
Howaner
dd423a2467 Merge branch 'master' into Fixes 2014-09-25 19:22:46 +02:00
Howaner
060ac500fc Fixed wrong Surrounding size 2014-09-25 19:19:30 +02:00
Howaner
7cdcf0a883 Anvil: Arrow Tile tags are a short in Vanilla 2014-09-25 19:01:44 +02:00
Tycho
b2f5ab9678 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-25 17:58:12 +01:00
Howaner
12621e3800 Use the json writer to write sign texts. 
Without this change the client disconnects if the text contains "
 2014-09-25 18:49:55 +02:00
Howaner
67fe834499 Fixed dispender direction bug 2014-09-25 18:37:36 +02:00
Howaner
daf5127b28 Fixed hanging direction bugs. 2014-09-25 18:37:24 +02:00
madmaxoft
c6f78d516b Redstone: Fixed a crash with repeaters on a chunk border. 2014-09-25 18:36:11 +02:00
madmaxoft
aeabc4ff6b 1.8 Protocol: Fixed problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
a518a83c25 1.7 Protocol: fixed potential problems with no-payload packets. 2014-09-25 18:36:10 +02:00
madmaxoft
843f31ecba HangingEntity: Silenced a crash. 
Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log.
 2014-09-25 18:36:09 +02:00
Tycho
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
32ecb121a3 derp 2014-09-24 15:30:52 +02:00
Howaner
1d588b5195 Don't create two entity lists. 2014-09-24 15:17:20 +02:00
Howaner
65077c314a Merge branch 'master' into WorldLoader 2014-09-24 15:00:49 +02:00
madmaxoft
8d9dfc5d1a Anvil: Wolf collar color is a byte in Vanilla. 
Kept the old Int reading for compatibility reasons.
Ref.: #1448
 2014-09-23 22:22:38 +02:00
Howaner
2832685c02 Merge branch 'master' into WorldLoader 2014-09-23 22:16:05 +02:00
madmaxoft
d04ab9b703 Fixed compiler warnings in 1.8 protocol. 2014-09-23 22:12:48 +02:00
madmaxoft
0b40ce971c Fixed a crash in WSSAnvil. 
Reported as #1448.
 2014-09-23 22:12:47 +02:00
Howaner
366af5067b MCServer world compatiblity with vanilla and mcedit. 2014-09-23 19:16:17 +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
archshift
5f6bac2091 Made ExpBottleEntity break on entities. 
Fixes #1369
 2014-09-23 00:28:12 -07:00
Chris Darnell
806871b86f A few compiler warning fixes 2014-09-22 18:23:56 -04:00
Howaner
1aa64f32e1 Updated README.md 2014-09-22 22:07:58 +02:00
Howaner
fc11818f4c Hotfixed 1.8 item reading. 2014-09-22 22:06:08 +02:00
Alexander Harkness
5f823fd18d Merge pull request #1398 from mc-server/1.8-Protocol 
1.8 Protocol Update
 2014-09-22 20:45:22 +01:00
Howaner
9cddffb6df Changed metadata reading again. 2014-09-22 21:18:13 +02:00
Howaner
bcb11078e3 Fixed item nbt reading. 2014-09-22 17:15:08 +02:00
Chris Darnell
195b646aa4 Made it compile with clang 2014-09-22 03:22:36 -04:00
Tiger Wang
cb70925077 Fix crash in cLineBlockTracer 
* Fixes #1418
 2014-09-21 19:24:45 +01:00
madmaxoft
3676a84916 Fixed cParsedNBT::FindTagByPath(). 
There was an off-by-one error in the name handling.
 2014-09-20 23:01:42 +02:00
Howaner
6aa331a4fa Code improvements. 2014-09-19 15:07:01 +02:00
Howaner
4398156b2e Merge branch 'master' into 1.8-Protocol 2014-09-19 14:31:18 +02:00
Howaner
52c875531e Derp 2014-09-18 18:51:36 +02:00
Howaner
43ed690520 Exported player list states to extra functions. 2014-09-18 18:50:17 +02:00
Howaner
be6d4a5912 1.8: Simplified item metadata reading. 2014-09-18 16:04:03 +02:00
madmaxoft
95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02:00
madmaxoft
6f5aa487ed Voronoi biomegen: Added JitterSize and OddRowOffset. 2014-09-17 23:24:22 +02:00
Mattes D
0625556c37 Merge pull request #1437 from nesco/master 
Implemented spectator gamemode.
 2014-09-17 21:30:11 +02:00
nesco
bf85c0b0ab Implementing Spectator Mode 
Adding some proprieties of the spectator game mode in player.cpp :
- Players can't toss items
- Players can't touch the ground
 2014-09-17 21:17:06 +02:00
madmaxoft
16e9deba8d Added an explicit setting for allowing BungeeCord handshake. 2014-09-17 20:56:33 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Howaner
3ee211bbba Use xofts ReadPosition() code. 2014-09-17 17:53:42 +02:00
nesco
b70e09bc90 Update World.h 2014-09-17 17:32:37 +02:00
nesco
c63e14b6d1 Preparing 1.8 update 2014-09-17 17:15:47 +02:00
madmaxoft
010879e43f BungeeCord compatibility: don't overwrite UUID / properties. 2014-09-17 16:01:14 +02:00
madmaxoft
82317709f8 Full BungeeCord compatibility. 
Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
 2014-09-17 11:07:42 +02:00
madmaxoft
3406957f1b Initial BungeeCord support. 
Ref.: #1392
 2014-09-17 09:38:06 +02:00
Tycho
26a4845a99 IncrementalRedstoneSimulator now has no dependencies on cChunk 2014-09-16 20:29:31 +01:00
nesco
89c9aec5da Preparing 1.8 update 
Partially added Spectator gamemode
 2014-09-16 20:17:35 +02:00
nesco
f246faec16 Preparing 1.8 update 
Added Spectator gamemode
 2014-09-16 20:05:55 +02:00
nesco
120b23d65e Pre 1.8 release 
Added Spectator gamemode
 2014-09-16 20:04:17 +02:00
nesco
8dedbe4db5 Preparing 1.8 changes 
Added Spectator Gamemode
 2014-09-16 20:02:27 +02:00
nesco
be7483f26b Pre 1.8 release 
Added Gamemode Spectator
 2014-09-16 20:01:04 +02:00
madmaxoft
96f45a48d4 VoronoiMap: Added Jitter and OddRowOffset params. 2014-09-15 22:34:33 +02:00
Howaner
63142a7eb1 Simplified WriteUUID() 2014-09-14 20:08:18 +02:00
Howaner
382a42b3d6 Fixed warnings. 2014-09-14 14:24:28 +02:00
Howaner
92e7e5c615 Merge branch 'master' into 1.8-Protocol 2014-09-14 14:16:17 +02:00
Mattes D
c4a53c5d7d OSSupport: Fixed UNICODE Windows builds. 
The files now compile even inside UNICODE applications.
 2014-09-14 01:33:05 +02:00
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Tiger Wang
52d86728e6 Entities experience water resistance 2014-09-13 22:49:05 +01:00
Howaner
94d562502d 1.8: Updated scoreboard packets. 2014-09-13 21:48:16 +02:00
Howaner
f323955099 Moved chat json creating to the CompositeChat class. 2014-09-13 20:27:10 +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
Tiger Wang
4019847857 Fixed friction being applied whilst airborne 
Reported by tonibm9 in #1300.
 2014-09-12 20:50:24 +01:00
Howaner
d5306f265b Only drop flint or gravel, not both. 2014-09-12 19:38:00 +02:00
Howaner
96e03fc3ea Added extra mushroom handler. 2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Howaner
80b0631c43 Only place farmland if no block is upper than dirt/grass. 2014-09-12 18:21:11 +02:00
Howaner
a40eb93c33 Added hoe interact sound. 2014-09-12 18:15:49 +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
Masy98
5cf114da39 Added Sea Lantern drops 2014-09-12 17:01:03 +02:00
Masy98
7f42ba9fc1 Fixed 1.8 Item stacking and block harvesting 2014-09-12 16:48:37 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
3f000deb3b Disabled mobspawner itemdrop. 2014-09-12 15:59:46 +02:00
Howaner
a1716bb415 Players in survival mode are not allowed to break a bedrock. 2014-09-12 15:57:37 +02:00
Howaner
fb68382d9b Merge branch 'master' into 1.8-Protocol 2014-09-12 14:09:07 +02:00
Howaner
abcae75992 Fixed iron ore drop. 2014-09-12 14:08:56 +02:00