mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 01:09:44 +00:00
Code Issues Projects Releases Wiki Activity
8,890 Commits 16 Branches 439 Tags
Commit Graph

8890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dylan K. Taylor
ebf5ccea8a Merge branch 'release/3.3' 2018-09-26 13:12:54 +01:00
Dylan K. Taylor
3bb22f9778 Merge branch 'release/3.2' into release/3.3 2018-09-26 13:12:34 +01:00
Dylan K. Taylor
bb1944ca40 Merge branch 'release/3.1' into release/3.2 2018-09-26 13:12:20 +01:00
Dylan K. Taylor
d1a20ecb4a CommandReader: Require readline to be explicitly enabled on Windows 
readline on Windows causes issues with console output corruption. Additionally, PM readline impl is extremely buggy and probably ought to be removed. However, have a hotfix for now.
 2018-09-26 13:11:21 +01:00
Dylan K. Taylor
896ecb52f4 Merge branch 'release/3.3' 2018-09-24 18:27:26 -04:00
Dylan K. Taylor
16c636df83 Merge branch 'release/3.2' into release/3.3 2018-09-24 18:27:04 -04:00
Dylan K. Taylor
f6a8ec83a1 Merge branch 'release/3.1' into release/3.2 2018-09-24 18:26:39 -04:00
Dylan K. Taylor
28137efb53 Fixed server freezing when using chorus fruit from large Y coordinates 2018-09-24 18:26:20 -04:00
Dylan K. Taylor
9651b3f470 Crops: micro optimization - check age before generating random number (faster) 
I don't have any idea how much benefit this will provide in real terms, but it may be significant.
 2018-09-24 16:48:19 +01:00
Dylan K. Taylor
a195e940db Fixed BB and right-click action for daylight sensor 2018-09-24 16:37:18 +01:00
Dylan K. Taylor
a77e05f875 Implement corner stair BB handling 2018-09-24 16:25:17 +01:00
Dylan K. Taylor
0b989925d7 whitespace 2018-09-23 18:41:57 +01:00
Dylan K. Taylor
c501c740a1 Get rid of Block->canPassThrough() 
This is only implemented in 1 place where the collision box should just be zero anyway, so there's no point this existing.

There's a lot of other blocks which should have bounding boxes without collision boxes as well, but that's outside the scope of this commit.
 2018-09-23 17:05:03 +01:00
Dylan K. Taylor
3eca64e893 Merge branch 'release/3.3' 2018-09-23 16:45:22 +01:00
Dylan K. Taylor
e597067a92 Merge branch 'release/3.3' of https://github.com/pmmp/pocketmine-mp into release/3.3 2018-09-23 16:43:36 +01:00
Dylan K. Taylor
4f200c5183 Merge branch 'release/3.3' 2018-09-23 16:35:53 +01:00
Dylan K. Taylor
06f00020cd Merge branch 'release/3.2' into release/3.3 2018-09-23 16:35:20 +01:00
Dylan K. Taylor
7b0836d399 Merge branch 'release/3.1' into release/3.2 2018-09-23 16:35:11 +01:00
Dylan K. Taylor
cea146e335 Thin: use bounding box instead of collision boxes 2018-09-23 16:35:01 +01:00
Dylan K. Taylor
8873efc303 Duplicate block IDs into ItemIds to allow for split 
this will be necessary to deal with negative IDs (if I choose to do that), and it'll also be necessary if I decide to do any shift hacks to merge ID/variant for block IDs, because we don't want such things to affect items before we're ready to deal with that.
 2018-09-23 15:53:16 +01:00
Dylan K. Taylor
1427da0aeb Clean up item handling of blocks 2018-09-23 14:21:37 +01:00
Dylan K. Taylor
ed1c511c3c Hacks for dealing with negative item IDs... 2018-09-23 14:14:58 +01:00
Dylan K. Taylor
5eeaeb6c3e
Level: Bail on trying to unload a level during level tick (#2435) 2018-09-22 13:40:50 +01:00
Dylan K. Taylor
9d2e9e1663 Fixed torch facing bug with wrong metadata 
torches cannot face down
 2018-09-21 19:45:52 +01:00
Dylan K. Taylor
3edf3a3a80 Entity: remove unused import 2018-09-21 19:34:18 +01:00
Dylan K. Taylor
02d5f4da85 fix merge error 2018-09-21 19:32:59 +01:00
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