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

314 Commits

Author SHA1 Message Date
Jonathan Fabian
fbd0cf74bd Fix compile error on OS X introduced by commit ecf778bbec 
The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`.    Reversing the order of initialization fixes this.
 2014-12-21 23:02:02 -05:00
Mattes D
ecf778bbec cWorld: Moved initialization into constructor. 
Fixes CID 71781.
 2014-12-21 22:19:22 +01:00
Mattes D
4947880a5d Merge pull request #1581 from mc-server/redstone 
Resplit redstone .inc file and provided improvements
 2014-12-17 08:38:23 +01:00
Howaner
b3e5872c22 Fixed mob invisibility 2014-12-14 17:48:30 +01:00
Howaner
bed456033f "& 0x0f" isn't needed 2014-12-14 13:14:48 +01:00
Howaner
2a8c234f46 Fixes 2014-12-13 20:31:37 +01:00
Tiger Wang
4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
Mattes D
781b3303a5 Merge pull request #1657 from mc-server/PrepareChunk 
Prepare chunk
 2014-12-11 17:06:18 +01:00
Mattes D
fcd3d1bfed Added a cWorld:PrepareChunk function. 
It prepares the chunk - loads or generates it and lights it.
The spawn prepare process uses this function.
 2014-12-10 22:35:16 +01:00
Mattes D
fbf98b8488 Merge pull request #1655 from tonibm19/patch-2 
Added NetherOreNests to default nether generator.
 2014-12-10 17:44:53 +01:00
tonibm19
7ceeefb26f Moved NetherOreNests 2014-12-10 17:13:20 +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
Mattes D
209de0268a Moved NaturalPatches in front of PreSimulator and Animals. 2014-12-08 21:28:14 +01:00
tonibm19
74ef586400 Added NetherOreNests to nether default generator. 
Now there's quartz in the nether
 2014-12-08 19:37:42 +01:00
tonibm19
98bd724294 Added NaturalPatches to finishers 2014-12-08 19:08:46 +01:00
Mattes D
e08331a24b Fixed crash on server stop. 
The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed).
Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function.
 2014-12-07 16:14:27 +01: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
p-mcgowan
a8bbd5efe4 Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher 
update
 2014-12-05 11:24:09 -08:00
Mattes D
44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Mattes D
c014f5624c Merged branch 'origin/master' into c++11. 2014-12-04 22:04:16 +01:00
Jonathan Fabian
b0e4643eb6 Allow Spectator Gamemode as a world default. 2014-12-02 20:24:05 -05:00
p-mcgowan
7f8f2f1e70 forgot generation defaul init 2014-12-02 15:57:41 -08:00
STRWarrior
fa4a85c915 Added better soulsand rims 
As a finisher called SoulsandRims
 2014-12-01 16:36:48 +01:00
Mattes D
db0f791d43 Fixed a crash in cSpawnPrepare. 2014-11-30 18:19:29 +01:00
Mattes D
a73c800377 Improved comments for cWorld::DoWithPlayer(). 2014-11-30 11:11:47 +01:00
Vincent
20dcceb7e6 removed GetUsernames() from World 2014-11-29 15:46:31 -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
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Mattes D
9f4562289e Merge pull request #1604 from mc-server/GeneratorShapeRefactor 
Generator shape refactor
 2014-11-24 21:56:25 +01:00
Mattes D
3e068a01a8 Changed back capitalization. 2014-11-24 13:44:15 +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
b520f336da cWorld: Rewritten spawn preparation. 
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597.
 2014-11-22 16:00:19 +01:00
Mattes D
a05a318cdd cWorld: Changed generator defaults. 2014-11-20 22:51:07 +01: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
78fb789631 Fixed a security problem with signs. 2014-11-15 15:16:52 +01:00
Howaner
a0e1e43fc1 Merge branch 'master' into ViewDistance 2014-11-14 22:33:54 +01:00
Mattes D
58fe37814b Merge branch 'master' of https://github.com/mc-server/MCServer 2014-11-06 08:55:33 +01:00
Lukas Pioch
13b20d6fe2 renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump 2014-11-05 21:57:38 +01:00
Lukas Pioch
269d76a208 Simplified FindAndDoWithUUID, formatted line 2014-11-02 21:38:17 +01:00
Lukas Pioch
9f71a4e7ae Added FindAndDoWithUUID 2014-11-02 21:01:23 +01:00
Howaner
9c7661f50f Added a MaxViewDistance option. 2014-10-30 21:24:10 +01:00
Tiger Wang
85c298d73e Cleaned up simulators 2014-10-25 21:54:00 +01:00
Mattes D
765bf006ad Merged branch 'master' into c++11. 2014-10-24 10:19:13 +02:00
Mattes D
190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile 
Merged ini file
 2014-10-24 09:13:39 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +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
44514e53fc Merge branch 'master' into ChunkLoader 
Conflicts:
	src/ClientHandle.cpp
 2014-10-21 16:55:22 +02:00