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

86 Commits

Author SHA1 Message Date
Mattes D 846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
jammet 61300ab9ef Rabbit and cooked rabbit now stackable 
And corrected the alphabetical ordering.
 2015-05-09 12:56:23 +02:00
Tri125 429e545167 Fixed #1893 
Quartz ore now stack properly
 2015-05-07 11:49:11 -04:00
Mattes D b97f41b8c6 ItemHandler type fixes. 2015-04-20 09:17:26 +02:00
Mattes D c9fbcea66d ItemHandler: Using automatic array bounds. 2015-04-20 08:34:44 +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 1af6210466 Fixed forgotten big flower handler. 2014-12-25 00:51:24 +01:00
Mattes D ccdf03daaf Refactored all player block placing to go through hooks. 
Fixes #1618.
 2014-12-24 07:20:17 +01:00
Tiger Wang a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Howaner 7631047bb7 Leaves are harvest-able. 2014-10-07 18:24:22 +02:00
Howaner a5e09155c0 Corrected drops from dead bush, tall grass and cobweb. 2014-10-07 18:21:39 +02:00
Masy98 3591edd47e Fixed sorting 2014-10-01 19:26:36 +02:00
Masy98 0d2a041a69 Fixed Red Sandstone and Prismarine drops 2014-10-01 19:13:59 +02: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
Tiger Wang fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Mattes D 5b63a7fe98 Merge pull request #1353 from mc-server/Effects 
Added speed entity effect.
 2014-09-13 17:05:59 +02:00
Howaner 96e03fc3ea Added extra mushroom handler. 2014-09-12 19:34:19 +02:00
Howaner 1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Masy98 7f42ba9fc1 Fixed 1.8 Item stacking and block harvesting 2014-09-12 16:48:37 +02:00
Howaner 3f000deb3b Disabled mobspawner itemdrop. 2014-09-12 15:59:46 +02:00
Masy98 a01994389d Fixed mutton name in Sheep.cpp 2014-09-11 16:24:16 +02:00
Masy98 b185e7f4e6 Fixed mutton name in ItemHandler 2014-09-11 16:11:03 +02:00
madmaxoft 1cc65b6264 Fixed style and alpha-sorting. 2014-09-03 10:29:10 +02:00
archshift 34d6f0713e Added mutton, which sheep now drop when killed 2014-09-02 23:21:08 -07:00
Howaner 0fdb177208 Fixed potion removing in creative mode. 2014-08-30 12:46:26 +02:00
archshift d2d0ffee21 Fixed unsigned long comparison to size_t 2014-08-04 19:43:33 -07:00
Mattes D d2744713bb Merge pull request #1272 from Howaner/Food 
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
 2014-08-01 17:43:18 +02:00
Howaner 84462ba8b2 Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. 2014-07-31 23:04:00 +02:00
Howaner bffad50436 Fixed water from ice and removed packed ice drop. 2014-07-31 18:41:48 +02:00
madmaxoft fd4ee20b2a Hotfixed compilation problems. 2014-07-27 23:15:51 +02:00
Howaner 4de8f5ca29 Rename function. 2014-07-26 13:26:14 +02:00
Howaner ba36e79bc5 Merge branch 'master' into Inventory2 
Conflicts:
	src/BlockInfo.cpp
 2014-07-26 13:23:11 +02:00
Tiger Wang 3a6002de5b Fixed block drops 
* Fixes #1242 (the issue addressed within)
 2014-07-24 21:38:25 +01:00
Howaner 396739cc0f Fix item durability. 
Fixes #1181
 2014-07-23 16:32:09 +02:00
Tiger Wang 18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves 
Conflicts:
	src/Defines.h
 2014-07-22 18:30:31 +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 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 5e198c6730 Basic style fixes. 2014-07-17 22:50:58 +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
archshift 40bb98510a ItemHandler.cpp: removed redundant food and drink checks 2014-07-14 13:46:43 -07:00
archshift e824cd09b3 Merge remote-tracking branch 'origin/master' into potions 
Conflicts:
	src/Entities/Player.cpp
	src/Entities/ProjectileEntity.cpp
 2014-07-09 23:28:27 -07:00
Howaner 64e6667435 Only fixes the server crash. 2014-07-01 20:34:50 +02:00
Howaner 64f6ddf1e2 Fix server-crash with non-existing items. 2014-07-01 14:47:49 +02:00
Tiger Wang 61cb08b546 Implemented tripwire(s) (hooks) 
* Fixes #944
 2014-06-28 20:44:34 +01:00
archshift e8143de01b Nullify deleted pointers. 2014-06-19 01:49:56 -07:00
archshift 3766ac96d7 ItemHandler: changed IsDrinkable() to take a short argument 2014-06-17 11:39:20 -07:00