8464 Commits

Author SHA1 Message Date
Dylan K. Taylor
a093ba3ed9 thanks git 2018-09-21 19:30:04 +01:00
Dylan K. Taylor
4a7f8fd9d9 Implemented behaviour for cocoa pods 2018-09-21 19:28:31 +01:00
Dylan K. Taylor
56d9943b0d Nuke Block->meta, split into variant and state properties, lots of cleanup
This is a major change to the way block metadata is handled within the PM core. This separates variant metadata (which really ought to be part of the ID) from state metadata, and in a couple of cases flattens separate states of blocks together.

The result of this is that invalid variants can be much more easily detected, and additionally state handling is much cleaner since meta is only needed at the serialize layer instead of throughout the code.
2018-09-21 19:28:10 +01:00
Dylan K. Taylor
a55ab54ddb Merge branch 'release/3.3' 2018-09-20 19:02:48 +01:00
Dylan K. Taylor
2712287995 Merge branch 'release/3.2' into release/3.3 2018-09-20 19:02:39 +01:00
Dylan K. Taylor
8db1ccc1ae Merge branch 'release/3.1' into release/3.2 2018-09-20 19:02:09 +01:00
Dylan K. Taylor
5d56030afa Item: make nbtDeserialize() return AIR when reading an unknown PC item
This is scummy, but it's better than crashing the whole server just because a chest contained an unknown item.
2018-09-20 19:00:44 +01:00
Dylan K. Taylor
eab7424955 Merge branch 'release/3.3' 2018-09-20 17:05:01 +01:00
Dylan K. Taylor
6be5e75263 Merge branch 'release/3.2' into release/3.3 2018-09-20 17:04:55 +01:00
Dylan K. Taylor
d9c251b613 Merge branch 'release/3.1' into release/3.2 2018-09-20 17:04:45 +01:00
Dylan K. Taylor
8085b81f5c fix phars 2018-09-20 17:04:34 +01:00
Dylan K. Taylor
960fdb433e Merge branch 'release/3.3' 2018-09-20 16:50:11 +01:00
Dylan K. Taylor
6b44f99dfb Merge branch 'release/3.2' into release/3.3 2018-09-20 16:50:04 +01:00
Dylan K. Taylor
33d3fff3c5 Merge branch 'release/3.1' into release/3.2 2018-09-20 16:49:57 +01:00
Dylan K. Taylor
7c092b93b4 Fixed bug when placing blocks by clicking on redstone ore 2018-09-20 16:49:50 +01:00
Dylan K. Taylor
9b4d82630b BlockFactory: remove $solid
this is premature optimization and will run into problems once we enter the flattening.
2018-09-20 16:26:15 +01:00
Dylan K. Taylor
19e68f98a7 Level: Remove unnecessary BlockFactory::$lightFilter usage 2018-09-20 16:16:28 +01:00
Dylan K. Taylor
aa05650994 Fixed block picking for mob heads 2018-09-20 13:11:45 +01:00
Dylan K. Taylor
668da0772a WaterLily: fixed broken placement logic 2018-09-20 12:49:36 +01:00
Dylan K. Taylor
758d9b9784 Farmland: fixed block picking 2018-09-20 12:03:01 +01:00
Dylan K. Taylor
24a6bf7365 PocketMine.php: Allow overriding autoloader path using --bootstrap
I've gotten tired of re-running composer every time I switch branches...
2018-09-20 12:01:39 +01:00
Dylan K. Taylor
9a5d51fd3d Fixed block-picking cake giving the block instead of item 2018-09-20 11:31:48 +01:00
Dylan K. Taylor
058bd07319 Merge branch 'release/3.3' 2018-09-20 10:04:42 +01:00
Dylan K. Taylor
fa9ea6a7d7 Merge branch 'release/3.2' into release/3.3 2018-09-20 10:04:19 +01:00
Dylan K. Taylor
6a7f39978b Merge branch 'release/3.1' into release/3.2 2018-09-20 10:03:47 +01:00
Dylan K. Taylor
c52e1ea9f9 Fixed block picking double slabs giving the double slab block 2018-09-20 10:02:55 +01:00
Dylan K. Taylor
7da51ae97e Fixed ItemBlocks passing the wrong block name to their constructors 2018-09-19 17:51:28 +01:00
Dylan K. Taylor
d92e79ba54 Level: fix crashdump #754691 2018-09-19 17:39:31 +01:00
Dylan K. Taylor
0f33459632 missed this because it was too far to the right of the screen... 2018-09-19 16:20:54 +01:00
Dylan K. Taylor
d291345ed7 Clean up some unused imports 2018-09-19 16:20:16 +01:00
Dylan K. Taylor
caca097300 Merge branch 'release/3.3' 2018-09-19 16:18:53 +01:00
Dylan K. Taylor
5e94d20d79 Merge branch 'release/3.2' into release/3.3 2018-09-19 16:17:00 +01:00
Dylan K. Taylor
a0bb747d6d Merge branch 'release/3.1' into release/3.2 2018-09-19 16:16:18 +01:00
Dylan K. Taylor
4bc0d850b1 Added Block->getRuntimeId(), clean up some mess 2018-09-19 16:16:10 +01:00
Dylan K. Taylor
dbe0ee2d44 BlockFactory: don't pre-populate gaps with UnknownBlock objects
this produces a minor reduction in memory usage.
2018-09-19 15:17:39 +01:00
Dylan K. Taylor
ef038d9625 Level: use block directly in updateBlockSkyLight() 2018-09-19 15:07:24 +01:00
Dylan K. Taylor
48a5eeb3a4 BlockFactory: remove some useless static arrays 2018-09-19 15:06:58 +01:00
Dylan K. Taylor
a80d5bb6a8 Leaf log search is type agnostic
any wood type will do
2018-09-19 08:47:40 +01:00
Dylan K. Taylor
01f12d6147 Merge branch 'release/3.3' 2018-09-18 12:32:12 +01:00
Dylan K. Taylor
ad9df6764d Merge branch 'release/3.2' into release/3.3 2018-09-18 12:32:07 +01:00
Dylan K. Taylor
97583c8b04 Merge branch 'release/3.1' into release/3.2 2018-09-18 12:32:01 +01:00
Dylan K. Taylor
107192c753 Bed: fixed block-pick giving wrong colour items 2018-09-18 12:31:53 +01:00
Dylan K. Taylor
c721503b7a Merge branch 'release/3.3' 2018-09-18 12:22:32 +01:00
Dylan K. Taylor
6309a242dc Merge branch 'release/3.2' into release/3.3 2018-09-18 12:22:26 +01:00
Dylan K. Taylor
870f9abc20 Merge branch 'release/3.1' into release/3.2 2018-09-18 12:22:20 +01:00
Dylan K. Taylor
0e2bbc44db Fixed drops and item picking of Brewing Stand 2018-09-18 12:22:12 +01:00
Dylan K. Taylor
31e4093882 Remove some remaining hardcoded meta maps 2018-09-16 18:00:16 +01:00
Dylan K. Taylor
8aab51c532 Merge branch 'release/3.3' 2018-09-16 17:47:41 +01:00
Dylan K. Taylor
e58d015f14 Merge branch 'release/3.2' into release/3.3 2018-09-16 17:47:08 +01:00
Dylan K. Taylor
d9768abe47 Merge branch 'release/3.1' into release/3.2 2018-09-16 17:47:01 +01:00