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

7911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
STRWarrior
3fb10f064c Made comment in example code smaller 
It caused the whole page to extend beyond the max width
 2014-12-13 15:34:46 +01:00
STRWarrior
4f2931dd39 Reverted main_APIDump.lua changes 2014-12-13 15:33:51 +01:00
STRWarrior
f62a0e137e Fixed the width sometimes going over the div size 2014-12-13 12:59:23 +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
1b1f971752 Merge remote-tracking branch 'planetx/master' 2014-12-11 11:17:54 +01:00
Mattes D
09453619e6 Fixed DungeonRooms edges not generating sometimes. 2014-12-11 11:16:11 +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
Vincent
9bba8e4c7d Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin() 
Compiles correctly.
 2014-12-10 00:45:24 -08:00
Vincent
3a2759fdc1 Fixed return value in CheckMultiLogin() 2014-12-09 14:23:44 -08:00
Howaner
e21159d4a8 Fixed compiling. 2014-12-09 13:29:22 +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
e9a27db028 Changed DoWithPlayer to auto instead of using iterator. 2014-12-08 15:58:46 -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
Mattes D
209de0268a Moved NaturalPatches in front of PreSimulator and Animals. 2014-12-08 21:28:14 +01:00
planetx
ce3adf89fa Check to see if header write out is required 2014-12-08 11:23:19 -08:00
tonibm19
74ef586400 Added NetherOreNests to nether default generator. 
Now there's quartz in the nether
 2014-12-08 19:37:42 +01:00
Alexander Harkness
541eb91542 Merge pull request #1654 from tonibm19/patch-1 
Added NaturalPatches to the default finishers
 2014-12-08 18:22:34 +00:00
tonibm19
98bd724294 Added NaturalPatches to finishers 2014-12-08 19:08:46 +01:00
planetx
1674f505f8 Added timestamp to merged files WSSAnvil 2014-12-08 08:28:44 -08:00
planetx
65c1d4f7b6 Added timestamp to merged files WSSAnvil 2014-12-08 08:26:37 -08:00
planetx
a1da0e7205 Added timestamp to new files WSSAnvil 2014-12-08 08:22:40 -08:00
Vincent
e28cc876c4 created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World. 2014-12-08 00:57:46 -08:00
Vincent
6de07d4a39 Fixed compile errors 2014-12-08 00:45:29 -08:00
Vincent
656964dc38 removed last space in handlehandshake 2014-12-08 00:19:33 -08:00
Vincent
ed09e76023 Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player. 2014-12-08 00:16:09 -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
planetx
8f5e861674 Added Timestamp info to chunks in WSSAnvil 2014-12-07 14:44:08 -08:00
Mattes D
d323c0ba76 Merge pull request #1563 from mc-server/c++11Events 
Reimplemented cEvent using C++11 primitives.
 2014-12-07 22:41:34 +01:00
Vincent
83c728fce4 Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253 2014-12-07 12:45:39 -08:00
Vincent
8edfd78295 changed from using iterator to auto for server and clienthandle 2014-12-07 12:41:42 -08:00
Mattes D
2bd03ee1f9 cMojangAPI: Fixed a possible problem with thread termination order. 2014-12-07 21:38:28 +01:00
Mattes D
c65bb6341d Fixed integer overflow problems. 
The event would overflow when requesting a 60 minute timeout.
 2014-12-07 21:37:47 +01:00
Mattes D
8ad1afcc1b Merge remote-tracking branch 'origin/master' into c++11Events 2014-12-07 18:15:23 +01:00
Mattes D
77cf657790 Fixed format warning. 2014-12-07 17:29:39 +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
Mattes D
d00ebd7ee7 Merge pull request #1555 from mc-server/c++11 
C++11
 2014-12-07 15:01:36 +01:00
STRWarrior
ba99107591 Reduced river height 
Rivers would exceed the water height quite often
 2014-12-07 12:03:52 +01:00
STRWarrior
95c83abcdb Fixed error message in cFinishGenPassiveMobs 
It would send an error message when trying to spawn mobs in a desert
 2014-12-07 12:00:36 +01:00
Mattes D
263fabc816 Replaced most auto_ptr with unique_ptr. 2014-12-06 23:03:17 +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
Mattes D
3f23813412 Merge pull request #1647 from mc-server/SocketThreadsFix 
Fixes socket leak in HTTP server.
 2014-12-06 16:08:08 +01:00
Mattes D
c5dc5ac45f FinishGenPassiveMobs: Cosmetic changes. 2014-12-05 22:46:46 +01:00
Mattes D
5712fadf31 Merge pull request #1642 from p-mcgowan/animalTerrainFinisher 
Animal terrain finisher
 2014-12-05 22:19:44 +01:00
p-mcgowan
b25fcb0972 formatting and default spawn percentage 2014-12-05 11:31:01 -08: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
8e56d7539d CheckBasicStyle: Check missing braces for control statements. 
Only single-line control statements are checked.
 2014-12-05 16:59:56 +01:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00