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
Mattes D
21d5374b97
CheckBasicStyle: Added a check for parentheses around comparisons.
...
The check is only rudimentary and tends to fall towards missed positived rather than false positives.
2014-12-05 12:58:48 +01:00
Mattes D
44644ae025
Fixed reported parentheses around comparisons.
2014-12-05 12:58:47 +01:00
p-mcgowan
750b4a3eaa
reformat
2014-12-05 01:01:10 -08:00
p-mcgowan
c655d97c9d
restructure, with logic this time
2014-12-05 00:57:40 -08:00
Mattes D
ad13a80d14
Merge pull request #1649 from jonfabe/InfoDumpFix
...
Fix duplicate commands added to README.md
2014-12-05 08:09:56 +01:00
Jonathan Fabian
a1c6e89273
Fix duplicate commands added to README.md
2014-12-04 23:25:46 -05:00
p-mcgowan
bd8c1850da
restructured random animals, added check for desert (update as per wiki)
2014-12-04 17:20:19 -08:00
p-mcgowan
78f0aebaf4
handle non-vanilla dimensions
2014-12-04 17:01:34 -08:00
p-mcgowan
538991c973
handle non-vanilla dimensions
2014-12-04 16:59:45 -08:00
p-mcgowan
53a33595b7
formatting fixes
2014-12-04 16:44:18 -08:00
Mattes D
b7820256a7
Merge pull request #1648 from mc-server/CraftingLuaFix
...
Fixed the CRAFTING_NO_RECIPE hook call.
2014-12-04 23:25:33 +01:00
Mattes D
8046022a83
Merge pull request #1638 from p-mcgowan/cactiNoLongerSpawnOnBeaches
...
cacti no longer spawn outside of desert variants
2014-12-04 23:08:33 +01:00
Mattes D
ed99216ba4
Tools: Removed unused Timer.* file from CMakeLists.txt.
2014-12-04 22:51:40 +01:00
Mattes D
22a3419791
CheckBasicStyle: Doesn't report false positives ending in a keyword.
2014-12-04 22:44:24 +01:00
p-mcgowan
8557ab18d0
conflict resolution
2014-12-04 13:31:58 -08:00
p-mcgowan
99a5b38e27
format blocks and randomizing
2014-12-04 13:28:27 -08:00
Mattes D
64f8428d03
Fixed trailing whitespace.
2014-12-04 22:07:04 +01:00
Mattes D
c014f5624c
Merged branch 'origin/master' into c++11.
2014-12-04 22:04:16 +01:00
p-mcgowan
b7c4ef05ac
last doxy fix
2014-12-04 01:18:55 -08:00
p-mcgowan
a36e7669a7
added p-mcgowan to contributors
2014-12-04 01:14:38 -08:00
p-mcgowan
83d4bec369
awful comment fixing, randomizer fix
2014-12-04 01:08:17 -08:00
Mattes D
34807248e2
Fixed the CRAFTING_NO_RECIPE hook call.
...
It used a pointer-to-pointer-to-cCraftingRecipe, which the Lua bindings didn't know how to handle, and emitted a warning message at runtime.
Fixes #1641 .
2014-12-04 09:21:57 +01:00
Mattes D
c8e75994cc
Merge pull request #1645 from jonfabe/SpectatorModeFixes
...
Spectator mode fixes
2014-12-04 09:10:14 +01:00
Jonathan Fabian
6ca47185c4
Updated whitespace in comment, changed conditional to logical equivalent due to popular demand
2014-12-03 23:04:53 -05:00
Mattes D
0ecc16c618
Fixed indent.
2014-12-03 18:24:28 +01:00
Mattes D
f206f34a3d
Server: Fixed a MSVC warning.
2014-12-03 18:04:21 +01:00
Mattes D
664ea804a3
ByteBuffer: Re-added Single-thread access checker.
2014-12-03 18:04:08 +01:00
Mattes D
010546051e
Fixes socket leak in HTTP server.
...
Fixes #1643 .
2014-12-03 16:14:26 +01:00
Mattes D
efb5f86cfa
Merge pull request #1646 from p-mcgowan/luaCheckstyleWarnings
...
clearing CheckBasicStyle.lua messages
2014-12-03 10:06:14 +01:00
Mattes D
4d74adaa67
Merge pull request #1640 from p-mcgowan/mooshroomMobSpawnerRule
...
added spawning rule to mooshroom
2014-12-03 09:34:26 +01:00
