flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8,392 Commits 1 Branch 0 Tags 92 MiB
be40ea323a
Commit Graph

4134 Commits

Author SHA1 Message Date
Mattes D
b8b3409b74 cNetwork: Linux compilation fix. 2015-01-22 20:12:41 +01:00
Mattes D
6f5e267d58 Implemented LibEvent-based client connections. 2015-01-22 20:12:40 +01:00
Mattes D
a8a7488b54 Added the libevent library. 2015-01-22 20:12:39 +01:00
Mattes D
9429cdcb53 Fixed warnings in StringUtils. 2015-01-21 20:39:34 +01:00
Matyas Dolak
adf3b3a569 ByteBuffer: Added support for reading unsigned shorts and ints. 2015-01-21 12:12:22 +01:00
Mattes D
2df8e4863f Fixed warnings in FastNBT.cpp. 2015-01-20 23:52:53 +01:00
Mattes D
5ac3a23586 Fixed warnings in 1.7 protocol. 2015-01-18 22:43:35 +01:00
Mattes D
45b1d5ff78 Fixed various warnings. 2015-01-18 18:01:24 +01:00
Mattes D
b1c58b7b52 cWorld: Fixed a type warning. 2015-01-18 15:10:05 +01:00
Mattes D
83ed6a2c1b Fixed type conversion warnings. 2015-01-18 11:25:16 +01:00
Mattes D
e38f41d32f Merge pull request #1702 from mc-server/chrono 
Started to convert more of MCServer to std::chrono
 2015-01-18 11:21:36 +01:00
Mattes D
e211aafaa4 Fixed type-conversion warnings. 2015-01-18 11:02:17 +01:00
worktycho
6758c1d2a1 correct comment to say milliseconds 2015-01-17 22:24:25 +00:00
Kirill Kirilenko
41f30edcf7 Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types. 2015-01-17 16:00:12 +03:00
Kirill Kirilenko
3dc994f9dc Fixed CppCheck: (performance) Possible inefficient checking for emptiness. 2015-01-17 15:20:03 +03:00
Kirill Kirilenko
2ce2741968 Fixed CppCheck: (performance) Function parameter should be passed by reference. 2015-01-17 15:19:23 +03:00
Tycho
bfe1960191 Converted Monster to std::chrono 2015-01-16 14:38:21 +00:00
Tycho
05c40db060 Converted cPickupEntity to std::chrono 2015-01-16 13:56:18 +00:00
Tycho
8dc9cf0c76 Converted MinecartEntity to std::chrono 2015-01-16 13:42:44 +00:00
Tycho
7562a381c0 Converted cExpOrbEntity to std::chrono 2015-01-16 13:27:10 +00:00
Tycho
d6f042da4a Converted ArrowEntityTiers to std::chrono 2015-01-16 13:13:23 +00:00
Tycho
acc2dcbbc3 Fix trailing whitespace 2015-01-11 21:53:20 +00:00
Tycho
2a9664d6ca Initial convertion of a_Dt to std::chrono 
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
 2015-01-11 21:12:26 +00:00
Tycho
4f75b94c99 Created new type cTickTime and rewrote cWorld::TickThread to use it 2015-01-11 01:54:18 +00:00
Mattes D
7d13a2a77a Fixed Linux compilation. 2015-01-03 22:39:55 +01:00
Mattes D
06c2669cf6 Protocols: Ignore garbage data at the end of PluginMessage packets. 
Fixes #1692.
 2015-01-03 22:24:15 +01:00
Mattes D
35a3a1b9f4 cByteBuffer: Improved SingleThreadAccessChecker performance. 
But it's still poor and unusable for regular testing.
 2015-01-03 22:24:12 +01:00
Mattes D
19ff14752e MobHead: Fixed wither spawning. 2014-12-25 20:41:27 +01:00
Mattes D
eddbce64be MobHeads: fixed regular head placement. 2014-12-25 20:41:12 +01:00
Mattes D
9e478c6f29 Fixed door placement. 2014-12-25 01:00:51 +01:00
Mattes D
1af6210466 Fixed forgotten big flower handler. 2014-12-25 00:51:24 +01:00
Mattes D
3da6e4374e Fixed basic style. 2014-12-25 00:44:09 +01:00
Mattes D
081e7ddd02 cIsThread: Fixed a race condition on thread start. 2014-12-25 00:34:54 +01:00
Mattes D
1d593134da Merge pull request #1686 from mc-server/PlaceBlockRefactor 
Place block refactor
 2014-12-25 00:31:56 +01:00
Mattes D
5609d76ed7 APIDump: Updated the player block placement documentation. 
The hooks now have fewer parameters but are called on all player-placed blocks (#1618).
 2014-12-24 20:02:51 +01:00
Mattes D
f07784b92f Fixed redstone dust placement on upside-down slabs. 2014-12-24 19:44:15 +01:00
Mattes D
e09348c05d ByteBuffer: SingleThreadAccessChecker is request-only. 
It slows the server down way too much, so it can't be turned on by default.
 2014-12-24 09:13:58 +01:00
Mattes D
63de5f8a55 Replaced a std::hash specialization with explicit type. 
std::hash is problematic in gcc / clang, one has a class, the other a struct.
 2014-12-24 08:38:37 +01:00
Mattes D
9c5463be1e gcc compilation fix. 2014-12-24 07:32:31 +01:00
Mattes D
ccdf03daaf Refactored all player block placing to go through hooks. 
Fixes #1618.
 2014-12-24 07:20:17 +01:00
Mattes D
075b19c7cb Added Vector3::TurnCW() and Vector3::TurnCCW() 2014-12-24 06:43:28 +01:00
worktycho
9fde173142 Init Mojang API pointer 
Fixes CID 90583
 2014-12-23 00:41:46 +00:00
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
Jonathan Fabian
ae8c871565 Added Depth Strider enchantment 2014-12-21 22:25:27 -05:00
Mattes D
f232704203 WSSAnvil: Added clamping to entity coords. 
Fixes CID 72854.
 2014-12-21 22:37:48 +01:00
Mattes D
e192da5316 FastNBT: Added a sanity check for number of list items. 
Fixes CID 55812.
 2014-12-21 22:25:01 +01:00
Mattes D
afdd53729c cChunk: Fixed missing initialization. 
Fixes CID 72670.
 2014-12-21 22:19:53 +01:00
Mattes D
ecf778bbec cWorld: Moved initialization into constructor. 
Fixes CID 71781.
 2014-12-21 22:19:22 +01:00
Mattes D
fe00c99c95 cEndGen: Fixed unitialized member variables. 
Fixes CID 43671.
 2014-12-21 21:59:44 +01:00
Mattes D
c9697083e5 cNoise3DComposable: Fixed unitialized member variables. 
Fixes CID 43665.
 2014-12-21 21:56:34 +01:00
Mattes D
d4c3821eca Fixed coverity issues in protocols. 
Fixes CID 73099, CID 66411.
 2014-12-21 20:01:42 +01:00
Mattes D
9e9459a367 Fixed a possible division by zero. 2014-12-21 19:48:29 +01:00
Tiger Wang
0d6672bf5d Fixed crash on restart 2014-12-21 14:31:20 +00:00
Mattes D
d4c9daddb8 Merge pull request #1682 from Masy98/entities 
Added Rabbits
 2014-12-21 15:18:42 +01:00
Tiger Wang
9755c5ba69 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-12-21 11:57:01 +00:00
Masy98
5695649bb9 Fixed damn empty line with no use 2014-12-20 13:04:42 +01:00
Masy98
7903ee485e Added Rabbit.h and Rabbit.cpp to the CMakeList 2014-12-20 11:41:23 +01:00
Masy98
3d2b1875a1 Fixed Rabbit size 2014-12-20 10:38:56 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98
5cfb6063c3 Fixed Guardians size and health 2014-12-19 16:06:43 +01:00
Masy98
f09c6701eb Guardian can now spawn if wanted!? 2014-12-18 20:44:39 +01:00
Masy98
706b9181e6 Merge branch 'master' into entities 2014-12-18 19:32:48 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Tiger Wang
dd1df3b6f7 Fix repeater unpowering 2014-12-18 00:22:46 +00:00
Howaner
c2926f8de1 derp 2014-12-17 20:08:55 +01:00
Howaner
fff108f20a Added comment. 2014-12-17 19:16:35 +01:00
Howaner
8277e1ec4e C++11 and function rename. 2014-12-17 19:14:01 +01:00
Howaner
6ee7fd3c67 Merge branch 'master' into Inventory 2014-12-17 17:33:30 +01:00
Howaner
5c99f3fada Fixed eMonsterType lua bugs. 2014-12-17 17:28:24 +01:00
Mattes D
a7e115ee3e Merge pull request #1674 from gushromp/master 
Fix for water spreading on bottom of the world
 2014-12-17 14:53:41 +01:00
Ivan Đorđević
99055f644b Removed unneeded newlines 2014-12-17 11:25:59 +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
Tiger Wang
8d9049603b NULL -> nullptr 2014-12-16 23:18:59 +00:00
gushromp
c2d32ce31b Merge branch 'master' of https://github.com/gushromp/MCServer 
Conflicts:
	src/Simulator/FloodyFluidSimulator.cpp
 2014-12-16 22:58:23 +01:00
gushromp
fd325e3990 Fixed water from spreading on bottom of world 2014-12-16 22:54:39 +01:00
gushromp
6cf3aa70f1 Fixed water from spreading on bottom of world 2014-12-16 22:38:57 +01:00
gushromp
b9977a39c3 Added braces to 'if' according to the code guidelines 2014-12-15 18:41:47 +01:00
blashyrk
4e5d2c36e9 Updated cPlayer::DoMoveToWorld to send target world's weather info to Player 2014-12-15 17:45:42 +01:00
Howaner
b3e5872c22 Fixed mob invisibility 2014-12-14 17:48:30 +01:00
Howaner
6436fe73ca Merge branch 'master' into Cocoa 2014-12-14 13:14:58 +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
Howaner
a595a4a842 Merge branch 'master' into Cocoa 2014-12-13 20:10:23 +01:00
Howaner
8591935a4b Implemented vanilla-like shift click. 
This fixes many visual bugs.
 2014-12-13 18:49:11 +01:00
STRWarrior
00bee25b4b WormNestCaves occasionally generates sandstone around the cave 
Only when the block around the cave is sand.
 2014-12-13 15:38:37 +01:00
Howaner
b6fd400276 Own classes for all windows. 2014-12-13 15:06:55 +01:00
Tiger Wang
4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
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
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
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
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
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
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
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
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
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
p-mcgowan
27185dd374 clearing CheckBasicStyle.lua messages 2014-12-03 00:26:15 -08:00
p-mcgowan
8c3b9ae15b class description and doxy-commenting 2014-12-03 00:12:32 -08:00
p-mcgowan
d348433406 doxy-commenting 2014-12-02 22:35:34 -08:00
Jonathan Fabian
1e6c13ea51 Fix Spaces to Tabs 2014-12-02 20:54:56 -05:00
Jonathan Fabian
24c6da6209 Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world. 2014-12-02 20:25:41 -05: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
p-mcgowan
2ea8a36df6 forgot initializer 2014-12-02 15:55:09 -08:00
p-mcgowan
6803df129f typos and oversights for lua and CI 2014-12-02 11:32:53 -08:00
p-mcgowan
8d7c2d4b13 fastRandom unused 2014-12-02 11:26:37 -08:00
p-mcgowan
585662e63f indentation, repeatable random, small corrections 2014-12-02 11:21:51 -08:00
p-mcgowan
14bc241ec1 updated mooshroom check for mycelium 2014-12-02 11:10:20 -08:00
Mattes D
bc8937d315 Merge pull request #1634 from mc-server/DungeonSpawners 
Dungeons spawners now spawn mobs
 2014-12-02 11:15:20 +01:00
p-mcgowan
978c9967ad fix comments after replacing spaces with tabs 2014-12-02 02:03:29 -08:00
p-mcgowan
2d93274a90 animal terrain finisher 2014-12-02 01:58:30 -08:00
p-mcgowan
9831220a1c animal terrain finisher 2014-12-02 01:37:17 -08:00
STRWarrior
f1177984f1 Fixed forgotten semicolon 2014-12-02 10:20:20 +01:00
STRWarrior
a466986f53 Using IntNoise3DInt instead of IntNoise3D 2014-12-02 09:55:25 +01:00
STRWarrior
5db3ceb333 Suggestions by xoft 
Using IntNoise3D to prevent needless floating point math
 2014-12-02 09:42:49 +01:00
p-mcgowan
865b567665 extra formatting parentheses 2014-12-01 22:13:52 -08:00
p-mcgowan
ae47c00547 added spawning rule to mooshroom 2014-12-01 22:11:28 -08:00
p-mcgowan
bb5a7d8f15 reformat for lua and CI 2014-12-01 17:47:36 -08:00
p-mcgowan
3bf111c69e formatting and commenting fixes 2014-12-01 17:28:46 -08:00
p-mcgowan
cb584a87bd cacti no longer spawn outside of desert variants 2014-12-01 11:44:20 -08:00
STRWarrior
7586069829 Using static cast for Dungeon spawners 2014-12-01 19:07:54 +01:00
STRWarrior
ca728da9b6 Using static cast for MineShaft spawners 2014-12-01 19:05:44 +01:00
STRWarrior
25e3869485 Mineshaft spawners now spawn cave spiders 2014-12-01 18:47:39 +01:00
Howaner
8e753fa590 Added cocoa pod. 2014-12-01 18:10:37 +01:00
STRWarrior
c0b08a6c1e Dungeons spawners now spawn mobs 
25% for a spider, 25% for a skeleton and 50% for a zombie spawner.
 2014-12-01 17:51:20 +01:00
STRWarrior
1bf0827a2f Simplefied SoulsandRims 
Replaced two for loops with a single if
 2014-12-01 17:29:35 +01:00
STRWarrior
cd0081bb67 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-12-01 16:39:42 +01:00
STRWarrior
fa4a85c915 Added better soulsand rims 
As a finisher called SoulsandRims
 2014-12-01 16:36:48 +01:00
Howaner
bcbd73f7d8 MobSpawner fixes. 2014-12-01 14:58:13 +01:00
Howaner
677dde51bd Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
 2014-12-01 14:43:03 +01:00
Mattes D
36500f88b2 Merge pull request #1624 from mc-server/LuaDeprecating 
Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead
 2014-12-01 09:50:34 +01:00
Mattes D
cc313c91ab DistortedHeightmap: Added missing initialization. 
This was probably the original cause for the "empty chunks".
Fixes #1433.
 2014-12-01 00:14:27 +01:00
Mattes D
f0ad6221c3 Noise3D: Fixed missing initialization. 
This should fix terrain being at Y=0 or Y=255 for the spawn chunk.
Fixes #1433.
 2014-12-01 00:09:58 +01:00
Howaner
6adf749164 Merge branch 'master' into MobSpawner 2014-11-30 19:38:52 +01:00
STRWarrior
e972c52e54 Hopefully fixed random build fails 2014-11-30 18:44:44 +01:00
Mattes D
db0f791d43 Fixed a crash in cSpawnPrepare. 2014-11-30 18:19:29 +01:00
STRWarrior
65dc452923 Fixed nether ceiling 2014-11-30 16:34:41 +01:00
Howaner
7049db5bf8 Fixed compiling on linux. 2014-11-30 14:23:51 +01:00
Mattes D
a73c800377 Improved comments for cWorld::DoWithPlayer(). 2014-11-30 11:11:47 +01:00
Howaner
c173bf61ad Removed old StringToMobType() function from Monster.cpp 2014-11-30 02:29:17 +01:00
vincentleung1
438a9b04cb Changed Kick message 2014-11-29 16:05:22 -08:00
vincentleung1
9caa3b19c1 removed extra space and fixed some formatting in cCallback 2014-11-29 15:59:48 -08:00
Vincent
20dcceb7e6 removed GetUsernames() from World 2014-11-29 15:46:31 -08:00
Vincent
72797b14fe Uses callback for players already in World. 2014-11-29 15:44:38 -08:00
Mattes D
e0a846d805 Removed unneeded include. 2014-11-29 23:55:15 +01:00
Mattes D
abbe18c0ab Fixed QtBiomeVisualiser compilation. 2014-11-29 23:55:06 +01:00
Mattes D
201313a9f8 Added a basic stacktracing for assert and signal failures. 2014-11-29 23:06:10 +01:00
Vincent
a7bf2725c8 fixed naming of strings and changed from i to I 2014-11-29 11:22:03 -08:00
Howaner
c673eb590f Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead 2014-11-29 15:40:38 +01:00
Howaner
473cb6e0b2 Removed unused imports. 2014-11-29 15:22:24 +01:00
Howaner
2478e290f9 Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. 2014-11-29 15:20:44 +01:00
Howaner
648fee1a08 Merge branch 'master' into MobSpawner 2014-11-29 12:05:35 +01:00
Vincent
61e761fdc2 issue 1253 - prevent multiple logins with same username 2014-11-29 00:36:15 -08:00
Mattes D
1480cdb944 Chunk: Fixed same-name iterators. 2014-11-27 23:15:08 +01:00
Mattes D
4545b8eed9 OctavedNoise: Another unshadowed local variable. 2014-11-27 23:13:40 +01:00
Mattes D
12ad2a07c0 Minecart.h: Fixed integral conversion warning. 2014-11-27 22:50:18 +01:00
Mattes D
2cff4e8c83 RidgedNoise: Replaced fabs with std::abs(). 2014-11-27 22:48:31 +01:00
Mattes D
9f24c0c4da OctavedNoise: Unshadowed a local variable. 2014-11-27 22:44:02 +01:00
Mattes D
a6ed5cb1d8 BlockEntities: Removed the extra semicolon. 2014-11-27 22:42:08 +01:00
Mattes D
186b2f3bd0 Replaced auto_ptr with unique_ptr. 2014-11-27 21:27:03 +01:00
Mattes D
61ce09e4d0 CompoGenBiomal: Fixed signed vs unsigned comparison. 2014-11-27 21:24:03 +01:00
Mattes D
e3e13f552f Fixed BlockStringToType return value. 
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
 2014-11-27 21:19:52 +01:00
Mattes D
a971dee379 CMake: Fixed linux builds. 2014-11-26 12:45:53 +01:00
Mattes D
a9e77fe7da cRoot: Fixed a memory leak with cRankManager. 2014-11-26 11:00:46 +01:00
Mattes D
413e5c20fe Windows: Fixed builds with LeakFinder enabled. 2014-11-26 11:00:21 +01:00
Mattes D
0ca891da6d WSSAnvil: Fixed bad code in arrow loading. 2014-11-26 10:14:11 +01:00
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Mattes D
c1a52dc9fb ClientHandle: Fixed max block place distance check. 
Fixes #1492
 2014-11-25 21:24:25 +01: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
e23bde503f Merge pull request #1611 from mc-server/SpawnPrepare 
cWorld: Rewritten spawn preparation.
 2014-11-24 15:39:05 +01:00
Mattes D
3e068a01a8 Changed back capitalization. 2014-11-24 13:44:15 +01:00
Mattes D
478bbad5ed Added TwoHeights shape generator. 
This is a faster shape generator that can generate overhangs and has biome awareness.
 2014-11-23 18:16:20 +01:00
Tiger Wang
2ae4d2a96a Removed unnecessary #includes 2014-11-23 17:13:40 +00: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
Tiger Wang
6382989ba0 Compilation fixes 2014-11-23 14:22:05 +00:00
Mattes D
9f4342434b Noise3D generator: Enlarged averaging to avoid steep beach slopes. 2014-11-23 15:10:55 +01:00
Mattes D
e9797c6a2a Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor 2014-11-23 12:33:04 +01:00
p-mcgowan
7a08c05787 formatting - newline at EOF inserted: Pig.cpp 2014-11-22 15:48:05 -08:00
p-mcgowan
d1b7a965d1 pigs turn into pigmen on lightning 2014-11-22 15:33:34 -08: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
p-mcgowan
793b1012c4 formatter error 2014-11-21 23:58:35 -08:00
p-mcgowan
635e9321c6 villagers turn into witches on lightning 2014-11-21 23:36:35 -08:00
p-mcgowan
ac2e3ede1d villagers turn into witches when struck by lightning 2014-11-21 23:20:44 -08:00
Mattes D
a05a318cdd cWorld: Changed generator defaults. 2014-11-20 22:51:07 +01:00
Mattes D
1ed32b825e BiomalNoise3D generator: finished all biomes. 2014-11-20 22:48:14 +01:00
Mattes D
b7dd2dddf9 CompoGenBiomal: Fixed sealevel offset. 2014-11-20 22:45:50 +01:00
Mattes D
f3e9fa74d2 Merge pull request #1594 from mc-server/LargeOakTree 
Large Oak Tree
 2014-11-20 21:30:50 +01:00
Mattes D
1e887d1381 CompoGenBiomal: Fixed sealevel not generating properly. 2014-11-20 18:05:30 +01:00
Mattes D
76058e8183 Generators: Unified SeaLevel into a single variable. 
It is shared between shape generators and composition generators and there's no sense in having two different values for those.
 2014-11-20 15:31:03 +01:00
Mattes D
5325885ef4 Noise3D generators: Changed noise generator to InterpolNoise. 2014-11-20 14:45:20 +01:00
Mattes D
288cbf12cb Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor 2014-11-20 10:13:10 +01:00
Mattes D
f1bddc607c Merge pull request #1603 from mc-server/ImprovedNoise 
Improved noise
 2014-11-20 09:26:05 +01:00
Mattes D
fef4133f6d cInterpolNoise: Implemented optimized 2D generating. 2014-11-19 16:58:27 +01:00
Mattes D
b177ff8ec5 cOctavedNoise: Removed misleading comment, fixed assert texts. 2014-11-19 16:52:56 +01:00
Mattes D
d7d4fcbdfe cOctavedNoise: Added a forgotten comment. 2014-11-18 23:22:09 +01:00
Mattes D
c048f2bd95 Added a cInterpolNoise template for faster noise generator. 
Used an instance of it in the Noise3D generator.
 2014-11-18 23:21:57 +01:00
Howaner
8b028c5c78 Finished mob spawner implementation. 2014-11-18 15:33:41 +01:00
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/Core
 2014-11-18 14:56:32 +01:00
Mattes D
2467d29a4e Moved all Noise-related files into a separate folder. 2014-11-18 12:07:08 +01:00
Mattes D
f683872f54 Refactored cRidgedNoise into a separate template. 
This allows us to make the ridges out of any noise and to combine the cRidgedNoise with cOctavedNoise.
 2014-11-18 09:49:53 +01:00
Mattes D
8c54fc0f7d OctavedNoise: linux compilation fixes. 2014-11-18 09:23:45 +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
Mattes D
e9082263c9 Added cOctavedNoise template. 
This allows us to use any noise generator in the combination of octaves.
 2014-11-17 23:02:53 +01:00
Howaner
d7efece5f2 Use cLuaState's stack trace. 2014-11-17 18:01:56 +01:00
Mattes D
faf0ce3d7f Fixed include path. 2014-11-17 17:13:42 +01:00
Mattes D
f9cfc36643 Added cImprovedNoise implementation. 2014-11-17 16:50:28 +01:00
Howaner
0e491273c1 Added UpdateSign() method to DeprecatedBindings.cpp 2014-11-17 14:57:24 +01:00
Mattes D
ae15c2f78e Fixed a wrong assert in cClientHandle::SetViewDistance(). 2014-11-17 12:34:14 +01:00
STRWarrior
ff036c9cef Changed comment 
Suggestion by xoft
 2014-11-16 19:50:57 +01:00
Mattes D
95e59056a1 BiomalNoise3D: Added more biomes. 2014-11-16 19:03:00 +01:00
Howaner
277151582f Use LastPlacedSign instead of LastPlacedBlock. 2014-11-15 22:36:31 +01:00
Howaner
09cea625fc Renamed m_UsedViewDistance to m_CurrentViewDistance 2014-11-15 22:26:54 +01:00
Mattes D
1240e583d2 Mobs: Fixed crash with terrain too high. 2014-11-15 21:45:57 +01:00
Mattes D
564b9ad337 Generator: Fixed crash with trees too high. 2014-11-15 21:45:24 +01:00
Mattes D
b0bcd75732 Snow generator: Fixed failure at top of the world. 2014-11-15 20:24:15 +01:00
Mattes D
889aa7404d ChunkDesc: Fixed comment about indexing. 2014-11-15 20:23:47 +01:00
Howaner
927d8d7702 Renamed m_SetViewDistance to m_RequestedViewDistance 2014-11-15 15:33:42 +01:00
Howaner
78fb789631 Fixed a security problem with signs. 2014-11-15 15:16:52 +01:00
Howaner
8c3c11d6b3 Renamed GetSettedViewDistance() to GetRequestedViewDistance() 2014-11-15 14:27:50 +01:00
Mattes D
30fa6a642c DungeonRooms: Changed to work with the new shape generators. 2014-11-15 11:17:05 +01:00
Howaner
83d3f3347b Use m_UsedViewDistance and m_SetViewDistance. 2014-11-14 22:53:12 +01:00
Howaner
a0e1e43fc1 Merge branch 'master' into ViewDistance 2014-11-14 22:33:54 +01:00
Mattes D
644240a0e5 Noise3D: Added jungles. 2014-11-14 22:17:11 +01:00
Mattes D
2789fafeb7 Noise3D: Added oceans. 2014-11-13 21:47:39 +01:00
Mattes D
7a3b3aeb3c Gen refactor: Implemented CompositedHeiGen. 
This fixes crashes in the Village generator due to the missing generator.
 2014-11-13 21:28:50 +01:00
STRWarrior
5584144be2 First implementation for the LargeOakTree 2014-11-13 10:44:36 +01:00
Mattes D
c9a3cb4d3f Fixed trailing whitespace. 2014-11-12 21:59:42 +01:00
Mattes D
5fb2526e07 Generator: Shape initial refactoring. 
The code compiles, but several structure generators are broken, crash on start.
 2014-11-12 21:24:26 +01:00
Mattes D
b525eee8e0 BiomalNoise3D: Added a few biomes. 2014-11-10 22:08:29 +01:00
STRWarrior
9a50a1fe0c TallGrassGenerator: Fixed crash when too high 2014-11-10 21:55:13 +01:00
Mattes D
4b95f7c69a Added BiomalNoise3D shape generator. 2014-11-10 17:00:14 +01:00
Mattes D
5993c06bd7 Noise3d Generator: Fixed unused function error. 2014-11-09 15:33:01 +01:00