1
0
Commit Graph

3834 Commits

Author SHA1 Message Date
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
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
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
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