Mattes D
b8072cbd62
Merge pull request #1660 from Seadragon91/master
...
Fixed print of milliseconds from chrono
2014-12-12 21:00:06 +01:00
Lukas Pioch
ece8b8ac96
Fixed print of milliseconds from chrono
2014-12-12 15:10:29 +01:00
Mattes D
125c70ab63
Updated the Core.
2014-12-12 14:33:11 +01:00
Mattes D
c8a49a6189
LightingThread: Fixed a memory leak.
2014-12-12 14:27:19 +01:00
Mattes D
6cd7e52eb7
Exported cWorld:PrepareChunk to Lua API, test in Debuggers.
2014-12-12 13:32:52 +01:00
Mattes D
1142879cc8
Debuggers: Added loadchunk and preparechunk commands.
...
preparechunk is not working yet because the required API is missing.
2014-12-11 21:21:58 +01:00
Mattes D
2a4ad3a475
Debuggers: Changed to use Info.lua file.
2014-12-11 21:21:57 +01:00
Mattes D
781b3303a5
Merge pull request #1657 from mc-server/PrepareChunk
...
Prepare chunk
2014-12-11 17:06:18 +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
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
563f41af65
Lighting thread: skip chunks that are already lit.
2014-12-10 22:27:48 +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
Mattes D
2ab8d2bd98
Added a RemoveIf() function to cQueue
2014-12-09 10:43:40 +01: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
