flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
10,523 Commits 1 Branch 0 Tags 92 MiB
907c22aa12
Commit Graph

612 Commits

Author SHA1 Message Date
bibo38
f8c28cc373 Commented the GetDirectionVec method 2015-11-07 17:23:02 +01:00
bibo38
64012bf46f Fixed the style problems and added some comments 2015-11-07 17:23:02 +01:00
bibo38
5fa077f869 Removed unused CanPull method 2015-11-07 17:23:02 +01:00
bibo38
558991a725 Extracted block moving code into a seperate method 2015-11-07 17:23:02 +01:00
bibo38
f35060e8b5 Replaced the usage of pistonMeta with a direction vector to allow better meta value abstraction 2015-11-07 17:23:02 +01:00
bibo38
ceec6c936d Fixed pulling/pushing of breakable blocks, which are not required to be moved 2015-11-07 17:23:02 +01:00
bibo38
ede4eec4c5 Implemented the basic slime block pulling 2015-11-07 17:23:02 +01:00
bibo38
59a9ac5e6f Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushed 2015-11-07 17:23:02 +01:00
bibo38
8f066a16ec Piston extension now works with the new recursive CanPushBlock method. 2015-11-07 17:23:02 +01:00
bibo38
e2d88106a9 Added the CanPushBlock method for the piston push check. 
This allows the recursive check for blocks to push, which is needed to implement the slime blocks into the piston system.
 2015-11-07 17:23:02 +01:00
bibo38
d92a92d78a Implemented the slime block dropping behaviour. 
Fixes #2530
 2015-11-07 17:23:02 +01:00
Lukas Pioch
9749c3aac9 Implemented brewing 2015-11-03 18:00:55 +01:00
Tiger Wang
a8bfe3a4c1 Prepared ScheduleTask for threading refactor 
* Llama-ified and condensed Schedule/QueueTask
- Removed hackery done with piston animations
 2015-09-25 18:56:49 +01:00
Mattes D
741dc78547 Lilypads drop when not on source water. 
Lilypad blocks now break and drop as items when the block below them changes to non-water or non-source water.
Fixes #2404.
 2015-09-25 14:42:32 +02:00
Mattes D
9871c0b073 Added CircleCI for stylechecking. 
This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
 2015-09-17 11:20:10 +02:00
David Erbelding
d0fd51ea9d Fixed flint drop rates from 1/30 to 1/10 to match the wiki. 2015-09-13 23:18:21 -04:00
Samuel Barney
cc83c4641d * Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it. 
* Blocks now have an effect upon plant growth, just like in vanilla.
 2015-08-19 10:48:21 -06:00
Julian Laubstein
dd5201c29e Some warning fixes 2015-08-18 08:49:00 +02:00
Nicholas W
fbbf27feea Fixed Iron Door 2015-08-01 08:47:55 -05:00
Mattes D
6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
Tiger Wang
c390604bc1 Merge pull request #2349 from cuberite/maps 
Improved maps
 2015-07-15 17:13:55 +01:00
Alexander Harkness
2603013d79 Merge pull request #2036 from cuberite/sign-metamirror 
Should Fix sign flipping.
 2015-07-15 14:58:28 +01:00
Tiger Wang
8656e149c8 Improved maps 2015-07-14 21:46:30 +01:00
Tiger Wang
9d4d25cdbf Merge pull request #2352 from mmdk95/master 
Fix duping doors
 2015-07-14 21:32:28 +01:00
mmdk95
c12704183b Fix duping doors (#1327) 2015-07-14 18:42:40 +02:00
Julian Laubstein
e92335b669 Merge pull request #2346 from SamJBarney/TreeGrowthUpdate 
Sapling Growth Update
 2015-07-14 16:36:53 +02:00
Samuel Barney
037dbf110d Torches can now be placed on top of upside down stairs. 2015-07-13 17:08:07 -06:00
Samuel Barney
d017fe5e39 Sapling Growth Update 
* Growth has been slowed down
* Saplings do not grow if they do not have enough space to grow
* Saplings do not grow unless the light level is 9 or above
* Dark Oak doesn't grow unless it is in a 2x2

Jungle Trees now will grow into a large tree when 2x2 saplings are used.
 2015-07-13 15:24:38 -06:00
Samuel Barney
ba0577bbd0 Moved grabbing the light value to after the transparency check. 2015-07-03 13:05:02 -06:00
Samuel Barney
0307b6aba0 Added missing parens 2015-07-02 16:19:23 -06:00
Samuel Barney
e248539d74 Grass now only dies if it has an opaque block above it. 
Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent.
 2015-07-02 16:16:05 -06:00
Mattes D
66a164a9a7 Added neighbor specification in the OnNeighborChanged() block callback. 
Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields.
Fixes #2213.
 2015-07-01 10:40:16 +02:00
STRWarrior
e5cfe0cd96 Added a size check for portals. 
Made the portal size configurable

Alpha-sorted SetXYZNetherPortalXYZ functions
 2015-06-28 17:05:44 +02:00
worktycho
7187c00342 Merge pull request #2282 from Haxi52/button-fixes 
Button fixes
 2015-06-25 15:46:33 +01:00
Hax52
9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Samuel Barney
e70e2b8ecc Rebased version of Code 2015-06-22 11:29:38 -06:00
Mattes D
8df31067d4 Externalized cPrefabPiecePool self-test. 2015-06-19 16:15:59 +02:00
Martin McArthur
d8865339f5 implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top 2015-06-14 12:53:09 +01:00
Lane Kolbly
dafdded7d9 Fixed typo in BlockDoor.h 2015-06-13 08:00:20 -05:00
Alexander Harkness
1e77f27191 Merge pull request #2144 from mc-server/comparators 
Redstone improvements [SEE DESC]
 2015-06-09 09:15:08 +01:00
Tiger Wang
de5b1401f8 Comparators 2015-06-06 12:21:09 +01:00
Mattes D
48c153bf53 Fixed warnings in MSVC. 
It complained about undefined return values or using uninitialized variables.
 2015-06-02 12:51:43 +02:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
Lukas Pioch
e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
worktycho
c0d7b4d569 Merge pull request #2030 from beeduck/master 
Issue #1868 and Issue #1984
 2015-05-21 07:50:30 +01:00
b33duck
ed3c0b771f Added open/close and sound effects for all door types 2015-05-20 16:24:16 -07:00
Julian Laubstein
48b7874099 Added missing fencetypes to torchhandler 2015-05-20 23:18:21 +02:00
tycho
77f1f58c0a Make -Werror disabling file only 
Ad fix a load of warnings
 2015-05-19 19:32:10 +01:00
tycho
fa4fb75e03 Fixed compile and a few more warnings 2015-05-19 12:28:31 +01:00
tycho
95e06ab93f Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Blocks/BlockLeaves.h
 2015-05-19 11:55:23 +01:00
tycho
f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Alexander Harkness
aedf9d05cb Improved leaves a bit more. 
Should fix #2058.
 2015-05-18 13:43:00 +01:00
Alexander Harkness
d48825fa81 Fix sapling probability. 
Probability is 5% of leaves drop a sapling.

This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
 2015-05-17 14:23:16 +01:00
Alexander Harkness
c9880b9cb5 Fixed bad logic. 2015-05-16 16:58:43 +01:00
Alexander Harkness
bda9b3e342 Should Fix sign flipping. 
Fixes #1118
 2015-05-16 16:49:47 +01:00
worktycho
6350e4f279 Bed uses bottom two bits for direction not three 2015-05-16 12:07:38 +01:00
Mattes D
c13b1931ff More style checking. 
Spaces around some operators are checked.
 2015-05-09 12:58:54 +02:00
jammet
6e3c584f07 Clay blocks are handled with the OreHandler 2015-04-29 10:14:34 +02:00
jammet
e42beb51ab Digging up a clay block spawns 4 clay items. 
Fixes #1884.
Closes #1891.
 2015-04-23 21:39:10 +02:00
jammet
6f0eafdc3a Nether Quartz is handled in the Ore handler. 
Fixes #1885, Closes #1888
 2015-04-23 15:21:14 +02:00
Mattes D
e51bd6bcd8 Merge pull request #1851 from wraith11/DoorFix 
Fix door placing in connection with slabs
 2015-04-23 00:55:51 +02:00
wraith11
794013315b Fix door placing in connection with slabs 
Except top-half slabs as transparent blocks for doors.
 2015-04-21 20:47:02 +02:00
Mattes D
ffe7dae4fc Fixed PolishedGranite et al crafting recipes. 
Fixes #1774. Ref.: #1859
 2015-04-16 20:59:57 +02:00
Mattes D
de8e5ea8e4 Placing a fluid from bucket calls plugin hooks. 
Ref.: #1857.
 2015-04-14 10:49:01 +02:00
Mattes D
afdd751fe3 Merge pull request #1799 from SnappingTurtles/BlockButton 
Buttons can be placed on the top and on the bottom face of a block
 2015-04-03 15:41:39 +02:00
Alexandre Guertin
97daf810ff Removed 0x6, 0x7 from BlockButton. 2015-03-25 16:12:02 -04:00
Mattes D
e5a7a730ed Merge pull request #1826 from mc-server/UnifyPacketizer 
Unify packetizer
 2015-03-24 13:09:41 +01:00
Mattes D
f1ef7f57ff Merge pull request #1775 from tommysanterre/terrainheightfix 
Correct all world height validations.
 2015-03-23 12:25:22 +01:00
Mattes D
cc069ccb2a Changed cEntity::m_UniqueID to UInt32. 2015-03-21 15:18:17 +01:00
Mattes D
8a43da0723 Merge pull request #1822 from mc-server/ResettableLuaCallback 
Added cPluginLua::cResettable interface, used for scheduled tasks.
 2015-03-20 16:11:50 +01:00
Mattes D
781c8683f7 Added cPluginLua::cResettable interface, used for scheduled tasks. 
This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data.
Fixes #1556.
 2015-03-20 15:13:33 +01:00
bibo38
3058c4c010 Removed Metavalue from Piston drops. Bugfix #1765 2015-03-20 11:14:42 +01:00
Tommy Santerre
3f6d823aa4 Correct world height validations. 
Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1).
Allow generation of world of flat height = 255
 2015-03-19 20:32:17 -04:00
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