Dylan K. Taylor
|
163c3855eb
|
Merge branch 'next-minor'
# Conflicts:
# resources/vanilla
# src/plugin/PluginBase.php
# src/plugin/PluginDescription.php
# src/pocketmine/Player.php
# src/pocketmine/network/rcon/RCON.php
# src/pocketmine/network/rcon/RCONInstance.php
# src/pocketmine/scheduler/AsyncTask.php
# src/pocketmine/tile/Spawnable.php
# src/scheduler/AsyncPool.php
# src/utils/Config.php
# src/utils/Timezone.php
# src/utils/UUID.php
# src/utils/Utils.php
# src/world/format/io/region/RegionLoader.php
|
2020-04-19 11:13:41 +01:00 |
|
Dylan K. Taylor
|
86e051b7bf
|
Merge commit 'a2543ff80d2906bccda1a4e2fdbd9d8e7d147fb3'
|
2020-04-18 17:33:05 +01:00 |
|
Dylan K. Taylor
|
ca909ebc1d
|
Merge branch 'next-minor'
|
2020-03-10 13:05:37 +00:00 |
|
Dylan K. Taylor
|
995309424e
|
updated pocketmine/nbt dependency
this is going to need work on exception handling, but right now it's so inconsistent that it doesn't matter anyway.
|
2020-03-04 17:53:37 +00:00 |
|
Dylan K. Taylor
|
a633e415ef
|
FastChunkSerializer: use machine endianness for pack() (thanks @Frago9876543210)
this is faster due to not having to reverse bytes. Since we don't use this format for persistence, it's OK to use machine byte order for this.
|
2020-02-25 15:08:53 +00:00 |
|
Dylan K. Taylor
|
cd71a6204f
|
Revert "PopulationTask: do not populate light in chunks out of the gate"
This reverts commit 42148f0d15949faecfbbef8f09ef4355d3dd3899.
|
2020-02-11 19:43:25 +00:00 |
|
Dylan K. Taylor
|
42148f0d15
|
PopulationTask: do not populate light in chunks out of the gate
this is a relic from when we needed to store light on disk. Now we can just calculate lighting as-needed instead.
|
2020-02-11 19:14:01 +00:00 |
|
Dylan K. Taylor
|
9b6fa8c25b
|
Merge branch 'stable'
|
2020-02-11 19:12:39 +00:00 |
|
Dylan K. Taylor
|
d360439c92
|
FastChunkSerializer: expose a method to disable lighting serialization
this is useful for copies which don't care about lighting, such as chunk sending.
|
2020-02-09 17:48:30 +00:00 |
|
Dylan K. Taylor
|
2375e9519d
|
RegionWorldProvider: fix CS
|
2020-02-08 09:34:22 +00:00 |
|
Dylan K. Taylor
|
d2aca6023b
|
add native return types to closures (for phpstan)
|
2020-02-07 22:05:15 +00:00 |
|
Dylan K. Taylor
|
aac7da6c96
|
eliminate remaining empty() usages
|
2020-02-07 21:51:50 +00:00 |
|
Dylan K. Taylor
|
fb1126797a
|
Merge branch 'stable'
|
2020-02-07 18:13:55 +00:00 |
|
Dylan K. Taylor
|
e3833ba4f0
|
Merge branch 'stable'
|
2020-02-01 21:03:21 +00:00 |
|
Dylan K. Taylor
|
9c33ea8dd1
|
EnumTrait: use a better method to initialize enums
this method is simpler, and is also safe at the native type level.
Coincidentally, it also eliminates 30 PHPStan false-positives.
|
2020-02-01 20:33:30 +00:00 |
|
Dylan K. Taylor
|
ff63f6d055
|
fill in more iterable types (master)
|
2020-02-01 20:19:57 +00:00 |
|
Dylan K. Taylor
|
89c6da13ac
|
phpstan: use more class-string
|
2020-01-31 22:05:33 +00:00 |
|
Dylan K. Taylor
|
f65bf76fd8
|
Merge commit '799183e13e61e89cc6820ad3132a4147454017c6'
# Conflicts:
# resources/vanilla
# src/Server.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/tile/Tile.php
# src/world/generator/GeneratorManager.php
|
2020-01-31 21:26:40 +00:00 |
|
Dylan K. Taylor
|
cb16f5c142
|
Merge commit '260ac47588c76a2e6814cfba46773a990fb8c5da'
# Conflicts:
# resources/vanilla
# src/Server.php
# src/lang/Language.php
# src/network/mcpe/protocol/AddItemActorPacket.php
# src/network/mcpe/protocol/AddPlayerPacket.php
# src/network/mcpe/protocol/SetActorDataPacket.php
# src/network/mcpe/serializer/NetworkBinaryStream.php
# src/permission/Permission.php
# src/pocketmine/block/Leaves.php
# src/pocketmine/entity/DataPropertyManager.php
# src/pocketmine/entity/Entity.php
# src/pocketmine/item/Banner.php
# src/pocketmine/item/Item.php
# src/pocketmine/level/format/io/LevelProvider.php
# src/pocketmine/level/format/io/LevelProviderManager.php
# src/pocketmine/network/mcpe/protocol/AddActorPacket.php
# src/pocketmine/network/mcpe/protocol/LoginPacket.php
# src/pocketmine/tile/Banner.php
# src/scheduler/BulkCurlTask.php
# src/updater/AutoUpdater.php
# src/utils/Config.php
# src/utils/Utils.php
# src/world/generator/Flat.php
# src/world/generator/Generator.php
|
2020-01-31 21:07:34 +00:00 |
|
Dylan K. Taylor
|
465d8cda79
|
Merge commit 'a5764b3ae98a70fe8f20f9b403a4ab84b51b11d8'
# Conflicts:
# resources/vanilla
# src/pocketmine/level/format/io/LevelProvider.php
# src/world/generator/Generator.php
# src/world/generator/GeneratorRegisterTask.php
|
2020-01-31 19:32:38 +00:00 |
|
Dylan K. Taylor
|
9492325eef
|
Merge branch 'stable'
|
2020-01-29 20:01:30 +00:00 |
|
Dylan K. Taylor
|
5c4487c980
|
added some callable prototypes for phpstan
|
2020-01-29 19:56:16 +00:00 |
|
Dylan K. Taylor
|
5955ff5393
|
fix phpdoc spacing screwed up by phpstorm
|
2020-01-22 15:20:50 +00:00 |
|
Dylan K. Taylor
|
8efc4d12ec
|
trim phpdoc lines
|
2020-01-22 15:18:37 +00:00 |
|
Dylan K. Taylor
|
0b423c5b96
|
Merge branch 'stable'
|
2020-01-22 15:16:10 +00:00 |
|
Dylan K. Taylor
|
055b13a6cf
|
strip extra blank lines (php-cs-fixer)
|
2020-01-22 15:14:10 +00:00 |
|
Dylan K. Taylor
|
1b33143f4f
|
pass 2, manual removal of incorrect non-nullable phpdoc types
|
2020-01-22 12:06:47 +00:00 |
|
Dylan K. Taylor
|
67bcc1c0fb
|
phpdoc armageddon for master, pass 1
|
2020-01-22 11:55:03 +00:00 |
|
Dylan K. Taylor
|
3ee6887792
|
populate remaining missing return types, using native returns where possible
this is done separately to stable so that stable changes can be integrated easily using an empty merge.
|
2020-01-19 10:26:35 +00:00 |
|
Dylan K. Taylor
|
ebce102167
|
Merge commit '260869c0d5904401178419c99e1f26e32b6ba07e'
|
2020-01-18 18:22:12 +00:00 |
|
Dylan K. Taylor
|
9c06c1a06f
|
Merge branch 'stable'
|
2020-01-11 22:36:57 +00:00 |
|
Dylan K. Taylor
|
96b91af66a
|
Merge branch 'stable'
|
2020-01-11 21:41:38 +00:00 |
|
Dylan K. Taylor
|
aba71762e9
|
master-specific @var annotations
|
2020-01-09 17:50:01 +00:00 |
|
Dylan K. Taylor
|
cda1143a79
|
Merge branch 'stable'
|
2020-01-09 17:17:42 +00:00 |
|
Dylan K. Taylor
|
c73001d65e
|
Merge commit 'e6a58e269099a7942d157a214beacc6c30f5617d'
|
2020-01-09 16:46:58 +00:00 |
|
Dylan K. Taylor
|
0f718ea28b
|
Merge commit '8726604899d1a371567141e0831ed570d3233356'
|
2019-12-25 14:19:35 +00:00 |
|
Dylan K. Taylor
|
f7eea9bebb
|
Merge branch 'stable'
|
2019-12-13 18:23:01 +00:00 |
|
Dylan K. Taylor
|
c36377ea5a
|
Merge branch 'next-minor'
|
2019-12-12 19:47:12 +00:00 |
|
Dylan K. Taylor
|
a9c09e4517
|
Merge branch 'next-minor'
|
2019-12-12 13:52:14 +00:00 |
|
Dylan K. Taylor
|
4651bcf8c3
|
master: imports cleanup
it was easier to make an empty merge and re-run php-cs-fixer afterwards.
|
2019-12-11 23:23:03 +00:00 |
|
Dylan K. Taylor
|
c85c1c3c3f
|
Merge commit '82d9e481d2a0a389fbbc6dfd3672fc366127febc'
|
2019-12-11 23:06:35 +00:00 |
|
Dylan K. Taylor
|
3fa628f259
|
updated NBT dependency
|
2019-12-09 11:26:43 +00:00 |
|
Dylan K. Taylor
|
705228f427
|
Chunk: remove useless field defaults
|
2019-12-08 11:08:07 +00:00 |
|
Dylan K. Taylor
|
6b21f160bd
|
Chunk: fix type docs for NBTentities and NBTtiles
|
2019-12-08 11:07:14 +00:00 |
|
Dylan K. Taylor
|
af6cb605c5
|
Chunk: fix data loss caused by d3d7709ead3203c189f2ac3b79224b3e5e2bf902
|
2019-12-08 11:02:40 +00:00 |
|
Dylan K. Taylor
|
48e2473696
|
Position: mark world field as nullable (equivalent to 39c607cbd5e134a47fa338628d54eea4e45d6bc3)
|
2019-12-04 22:58:55 +00:00 |
|
Dylan K. Taylor
|
60154d8127
|
SubChunkIteratorManager: assert type of subchunk to make PHPStan happy
we know this should be a SubChunk, even though it doesn't.
|
2019-12-04 18:26:18 +00:00 |
|
Dylan K. Taylor
|
117e46f639
|
LevelDB: fix doc comment handling for deserializeLegacyExtraData()
|
2019-12-04 11:29:41 +00:00 |
|
Dylan K. Taylor
|
5f9ce78814
|
WorldProviderManager: removed incorrect param doc
this was used to trick phpstorm, but PHPStan doesn't like it, and it isn't consistently used anyway.
|
2019-12-03 12:08:04 +00:00 |
|
Dylan K. Taylor
|
d3d7709ead
|
Merge branch 'next-minor'
|
2019-12-03 11:55:45 +00:00 |
|