flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,747 Commits 1 Branch 0 Tags 92 MiB
109a07fd95
Commit Graph

535 Commits

Author SHA1 Message Date
worktycho
83531707f3 Merge pull request #1811 from mc-server/grass 
Fixed grass spread, closes #1743
 2015-03-15 12:16:37 +00:00
Mattes D
65d2ef32e9 Merge pull request #1734 from mc-server/pistons 
Handle client 'leave bed' request
 2015-03-14 22:44:04 +01:00
Tiger Wang
e94886c140 Fixed grass spread, closes #1743 
- Removed the salt parameter in cFastRandom functions, it wasn't doing
what we thought it was following the move to C++11
 2015-03-14 00:59:53 +00:00
Alexandre Guertin
adf5edc913 Buttons can be placed on the top and on the bottom face of a block 2015-03-09 18:13:55 -04:00
Howaner
a96c21fc0d Merge branch 'master' into Inventory 2015-03-09 22:39:11 +01:00
Tiger Wang
f3da0cf1ae Reverted non-functional changes 2015-03-05 21:21:39 +00:00
Alexander Harkness
7348bf3853 Grass checks for sufficient light before spreading 2015-03-05 19:30:00 +00:00
STRWarrior
e63b4f4913 Added experience drops when mining ores 2015-02-28 16:34:17 +01:00
Tiger Wang
3869f76cc2 Handle client 'leave bed' request 
* Fixes #1728
 2015-02-08 21:21:48 +00:00
Howaner
1eedccc56a Merge branch 'master' into Inventory 2015-01-25 00:34:19 +01:00
Kirill Kirilenko
14ea50cbe7 Fixed defect #43661 in Coverity list. 2015-01-23 19:06:23 +03:00
Mattes D
9e478c6f29 Fixed door placement. 2014-12-25 01:00:51 +01:00
Mattes D
ccdf03daaf Refactored all player block placing to go through hooks. 
Fixes #1618.
 2014-12-24 07:20:17 +01:00
Howaner
6ee7fd3c67 Merge branch 'master' into Inventory 2014-12-17 17:33:30 +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
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
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
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Howaner
8e753fa590 Added cocoa pod. 2014-12-01 18:10:37 +01:00
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner 
Conflicts:
	MCServer/Plugins/Core
 2014-11-18 14:56:32 +01:00
Tiger Wang
85c298d73e Cleaned up simulators 2014-10-25 21:54:00 +01:00
Tiger Wang
6fbc98def2 Fixed some block checks 
* Fixes #1330
 2014-10-25 00:22:31 +01:00
Alexander Harkness
57f822cd0e Signs can be placed on wallsigns. 
Fixes #1438
 2014-10-23 08:07:20 +01:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Howaner
f800f3c998 Moved tall grass pickups handle. 2014-10-21 18:06:44 +02:00
Howaner
283eda3c4e Merge branch 'master' into BlockFixes 2014-10-21 17:37:03 +02:00
Julian Laubstein
403f8581cf Added mechanics placeable on halfslabs 2014-10-19 15:01:01 +02:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Alexander Harkness
6af9d5ba01 Fixed compilation. 2014-10-11 18:39:46 +01:00
Howaner
a5e09155c0 Corrected drops from dead bush, tall grass and cobweb. 2014-10-07 18:21:39 +02:00
Howaner
e8e428a806 Corrected IsBlockAttachable() in BlockVine.h 2014-10-07 16:48:37 +02:00
Howaner
fec509935d Removed BlockHaybale.h from CMakeLists.txt 2014-10-07 15:39:24 +02:00
Howaner
e3a69a527d Removed unused cBlockHayBaleHandler. 2014-10-07 15:02:51 +02:00
Mattes D
db98820aa9 Merge pull request #1489 from mc-server/fixes 
Improved torch handler
 2014-10-04 10:02:10 +02:00
Tiger Wang
79e9de8d67 Comment suggestions 2014-10-03 21:38:23 +01:00
Masy98
1d875d0bc8 Added Daylight Sensors to the "can't push" list 2014-10-01 18:08:31 +02:00
Masy98
cc9e598803 Added missing 1.8 blocks, E_METAs and sounds 2014-10-01 17:57:53 +02:00
Tiger Wang
48c99dcd2e Improved torch handler 2014-09-30 22:00:33 +01:00
Howaner
7d3016c7ad Code improvements 2014-09-30 20:59:59 +02:00
Howaner
425df6b694 Fixed 1.8 dirt types 2014-09-30 20:31:27 +02:00
Howaner
83973520c8 Fixed iron trapdoors 2014-09-30 20:04:49 +02:00
Howaner
5111628ba5 Fixed 1.8 doors. 2014-09-30 19:49:42 +02:00
Julian Laubstein
b77480b4ef Indentation 2014-09-30 14:05:23 +02:00
Julian Laubstein
b2cf4004f8 Set right indentation 2014-09-30 12:45:44 +02:00
Julian Laubstein
d731ad37b1 actual solving of the halfslap+torch problem 2014-09-30 12:43:48 +02:00
madmaxoft
aae90c2cf0 Style fixes. 2014-09-29 21:38:11 +02:00
Alexander Harkness
bdb8d916c0 Fixed codestyle again. 2014-09-29 19:45:12 +01:00
w00tc0d3
9628733df2 BlockStone.h: fix the codestyle 2014-09-29 19:19:17 +02:00
netchip
6127c21af9 BlockStone: drop the right cobblestone on onBreak(). 
Signed-off-by: netchip <w00tc0d3@outlook.com>
 2014-09-29 17:18:20 +02:00
Julian Laubstein
f014d8764b Update BlockTorch.h 2014-09-29 13:17:24 +02:00
Julian Laubstein
0b438b5fe8 Added torches placeable on upside-down-halfslaps 2014-09-29 13:12:50 +02:00
madmaxoft
e7de548c89 Fixed minor style issues. 2014-09-27 21:37:36 +02:00
Masy98
6dd47e783a Added default value to switch and spruce gate to fence gate handler 2014-09-27 15:11:35 +02:00
Masy98
485bac2818 Fixed convertToPickups for fence gates 2014-09-27 14:23:58 +02:00
Masy98
30f9a4d3ab Fixed convertToPickups for doors 2014-09-27 14:19:45 +02:00
Howaner
033d16babb Merge branch 'master' into MobSpawner 
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
 2014-09-26 23:56:20 +02:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks 
Added 1.8 Blocks and Items
 2014-09-26 22:24:45 +02:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks 
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
 2014-09-26 18:32:31 +02:00
Tycho
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Mobs/Monster.h
 2014-09-25 15:22:08 +01:00
Howaner
718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
madmaxoft
95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests 
Conflicts:
	src/Blocks/ChunkInterface.h
 2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Howaner
d5306f265b Only drop flint or gravel, not both. 2014-09-12 19:38:00 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Masy98
5cf114da39 Added Sea Lantern drops 2014-09-12 17:01:03 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
abcae75992 Fixed iron ore drop. 2014-09-12 14:08:56 +02:00
Howaner
1849e620fc Added flint drop and fence gate meta reset. 2014-09-12 13:49:08 +02:00
Tycho
0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server 
THis wil hopefully allow for unit testing
 2014-09-11 17:48:21 +01:00
Masy98
741791ecfc Added barrier block 2014-09-11 16:07:54 +02:00
Masy98
e34767b265 Fixed incorrect handlers 2014-09-11 15:39:37 +02:00
Masy98
214cc0f15d Added stone slab in BlockSlab.h 2014-09-10 21:50:46 +02:00
Masy98
a9b4b60c80 Added new blocks to the BlockInfo 2014-09-10 21:44:04 +02:00
Masy98
f173cfe430 Added new blocks to the BlockHandler 2014-09-10 21:15:06 +02:00
Mattes D
76d5aa1d51 Merge pull request #1402 from Masy98/Sounds 
Moved sound-configs into BlockID.h and fixed/ added loads of sounds
 2014-09-10 08:36:33 +02:00
Masy98
65e6b1e50e Removed old sound-configuration for SignPosts 2014-09-09 20:10:37 +02:00
Masy98
a171a6ce93 Removed old sound-configuration for Repeaters 2014-09-09 19:50:35 +02:00
Masy98
27edb7f0d0 Removed old sound-configuration for Trapdoors 2014-09-09 19:37:07 +02:00
Masy98
6cc4ac0bca Removed old sound-configuration for doors 2014-09-09 16:28:08 +02:00
Masy98
acae3c9c65 Moved sound-configs into BlockID.h and fixed/ added loads of sounds 2014-09-09 16:00:26 +02:00
Tycho
2c945c8818 TimeOfDay does not need to be an Int64 2014-09-08 19:07:45 +01:00
madmaxoft
9a4e8bf83f Merge remote-tracking branch 'Hircine/Enchantments' 2014-09-01 14:03:39 +02:00
worktycho
365d2447d0 Check range of y in HasNearLog 
Fixes #803
 2014-08-31 00:15:48 +01:00
Jaume Aloy
4900645b28 Added a_Digger check 2014-08-30 00:27:33 +02:00
Mattes D
97c4c057e4 Fixed conversion warning. 2014-08-29 11:20:33 +03:00
Hownaer
c2260addf4 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-28 18:58:58 +02:00
Hownaer
eaf33e22cf Fixed anvil placing. 2014-08-28 18:57:56 +02:00
Mattes D
52a6b30f32 Merge remote-tracking branch 'origin/master' into CraftingFixes 2014-08-28 16:53:36 +03:00
Mattes D
49ac6fadfc Fixed spaces after "template" keyword. 2014-08-28 16:44:36 +03:00
Jaume Aloy
7d771953c0 More Enchantments 
- Added Thorns and Respiration enchantments
 2014-08-22 11:49:49 +02:00
Jaume Aloy
19d1c976e7 Protection Enchantments, some fixes 
- Protection echantments (fire, blast, feather falling, protection and
projectile). It isn't finished, add secondary effects and optimize the
code.
- Removed some brackets.
- Silk touch fixed.
 2014-08-21 12:08:38 +02:00
Howaner
f7774ec336 Merge branch 'master' into Fire 2014-08-20 22:25:05 +02:00
Howaner
67fc19301e Removed old classes from the CMakeLists.txt 2014-08-20 12:14:56 +02:00
Howaner
b5ffe06f88 Code formatting fixes. 2014-08-19 22:14:37 +02:00
Jaume Aloy
5008eb8c83 Changed if in BlockHandler 2014-08-19 18:40:42 +02:00
Jaume Aloy
596203e692 Fixes 
- Changed m_TicksLeftBurning > 0 for IsOnFire()
- Tried to do the changes in BlockHandler.cpp
- Removed m_Creator in ArrowEntity
- Added m_Enchantments in ProjectileEntity CreatorData
- Added blank lines between functions
 2014-08-19 17:57:32 +02:00
Jaume Aloy
07350de514 Changed if for switch 2014-08-19 16:47:33 +02:00
Jaume Aloy
1897f678f9 Added more enchantments and some fixes 
- Removed Debug messages
- Added Punch enchantment effect
- Added Silk Touch enchantment
- Added Unbreaking enchantment effect
 2014-08-19 16:08:17 +02:00
Howaner
74fabb079c Moved the clicked-through block check to the top of the function. 2014-08-11 22:34:33 +02:00
Howaner
938bf1df69 Changed comment. 2014-08-10 17:12:08 +02:00
Howaner
ebfc0fdc67 Added comment. 2014-08-08 22:04:53 +02:00
Howaner
3d68466ab0 Send the old slab to the client when the interact cancelled. 2014-08-08 18:55:05 +02:00
Tiger Wang
0b9eb20b92 Fixed signs not staying on other signs 2014-08-04 21:22:08 +01:00
Mattes D
35cfbfd51a Merge pull request #1269 from Howaner/BlockEntitys 
Added beacon.
 2014-08-01 17:43:02 +02:00
Howaner
87d195171a Changed IsSolid to FullyOccupiesVoxel 2014-07-31 23:08:08 +02:00
Howaner
bffad50436 Fixed water from ice and removed packed ice drop. 2014-07-31 18:41:48 +02:00
Howaner
89b1bbdc5f Added beacon. 2014-07-30 21:59:35 +02:00
Tiger Wang
8811837aea Merge branch 'master' into portals 
Conflicts:
	src/World.h
 2014-07-29 15:27:19 +01:00
Howaner
ba36e79bc5 Merge branch 'master' into Inventory2 
Conflicts:
	src/BlockInfo.cpp
 2014-07-26 13:23:11 +02:00
Tiger Wang
d3012d6904 Merge remote-tracking branch 'origin/master' 2014-07-24 21:38:46 +01:00
Tiger Wang
3a6002de5b Fixed block drops 
* Fixes #1242 (the issue addressed within)
 2014-07-24 21:38:25 +01:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
Howaner
396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00
madmaxoft
dfadcf7453 BlockLeaves: Fixed comment style. 2014-07-23 09:12:06 +02:00
Tiger Wang
bc5db3274f Fix misguided comment on bits... 
...obviously written by someone very confused, also known as me
 2014-07-22 21:09:37 +01:00
Tiger Wang
18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves 
Conflicts:
	src/Defines.h
 2014-07-22 18:30:31 +01:00
Tiger Wang
0a15e1f420 Suggestion and failed merge fix 2014-07-22 10:33:16 +01:00
Tiger Wang
3385ed56b8 Merge remote-tracking branch 'origin/master' into portals 
Conflicts:
	src/Chunk.cpp
	src/Entities/Player.cpp
	src/Root.cpp
	src/World.cpp
 2014-07-22 10:24:28 +01:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00
Tiger Wang
d0e7b2f18b Merge branch 'master' into saplingsandleaves 
Conflicts:
	src/Bindings/DeprecatedBindings.cpp
	src/Blocks/BlockSapling.h
 2014-07-20 12:02:23 +01:00
Tiger Wang
f68b04e029 Proper comment for DropBlock() 2014-07-20 12:00:20 +01:00
madmaxoft
00c524519e Fixed style: spaces after commas. 2014-07-19 14:53:41 +02:00
archshift
3d368b015e Blocks/CMakeLists.txt: Fixed header list after merge of master 2014-07-18 17:41:44 -07:00
archshift
725d1fd1e2 Subdirs: Only add_library if not using MSVC 2014-07-18 17:41:43 -07:00
archshift
61c4e2e5cb Blocks/CMakeLists.txt: Replaced glob with list of files 2014-07-18 17:41:42 -07:00
madmaxoft
23037ce7ec Normalized code style for both sign handlers. 2014-07-18 22:41:48 +02:00
Tiger Wang
37140ae578 Merge branch 'master' into portals 
Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
	src/ClientHandle.h
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Generating/FinishGen.cpp
	src/Protocol/Protocol.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol125.h
	src/Protocol/Protocol16x.cpp
	src/Protocol/Protocol16x.h
	src/Protocol/Protocol17x.cpp
	src/Protocol/Protocol17x.h
	src/Protocol/ProtocolRecognizer.cpp
	src/Protocol/ProtocolRecognizer.h
	src/Root.h
	src/World.cpp
 2014-07-18 20:10:51 +01:00
Howaner
44c944716b Removed cBlockSignPostHandler descend. 2014-07-18 17:04:01 +02:00
Howaner
eeacb6f222 Added a extra wall sign handler. 
Fixes #1119
 2014-07-18 02:19:30 +02:00
Tiger Wang
0f8c24e04d Fixed issues relating to saplings and leaves 
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
 2014-07-17 22:26:53 +01:00
madmaxoft
c03161f75d Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3 More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
madmaxoft
5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +02:00
madmaxoft
7a9f9ab744 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-07-17 22:23:08 +02:00
madmaxoft
2423fbf2ef Normalized comments. 
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
 2014-07-17 22:15:34 +02:00
Howaner
68cc9c6f91 Fix sapling drop. 2014-07-17 21:35:34 +02:00
Mattes D
5147220f12 Merge pull request #1189 from Masy98/Blocks 
Added various missing blocks in the lists in BlockInfo.cpp
 2014-07-15 14:54:45 +02:00
madmaxoft
9a970479ef Fixed code formatting. 2014-07-15 14:54:24 +02:00
madmaxoft
639dfdb67d Merge remote-tracking branch 'origin/ClearMetaMixin' 2014-07-15 14:44:18 +02:00
Masy98
2d245264b1 Added various missing blocks in the lists in BlockInfo.cpp 2014-07-15 13:34:45 +02:00
Tycho
01a31a1872 Added super typedef 2014-07-15 12:27:36 +01:00