Dylan K. Taylor
7b3c2a3703
Merge commit '3907a2b6ba58fa49022e3e7c8256731dfa2e0d00'
2020-03-14 13:32:35 +00:00
Dylan K. Taylor
e8bb6b8625
Command: fix output translation regression caused by 4c51f1dda348d9d1c53c89185ceeb909a1cad21a
2020-02-10 11:42:21 +00:00
Dylan K. Taylor
4c51f1dda3
Scrap TextContainer, make TranslationContainer immutable
...
TextContainer provided zero real value as a base of TranslationContainer, given that it required its own logic to be handled wherever accepted. As such, it's no better than a simple string.
Removing it also allows fixing an ambiguity when embedding translations inside other translations, allowing it to be made immutable.
2020-02-08 13:38:27 +00:00
Dylan K. Taylor
fb1126797a
Merge branch 'stable'
2020-02-07 18:13:55 +00:00
Dylan K. Taylor
54604398f2
Merge commit 'f1083bd9c402c1456f4fc7dce8271c33360dc227'
2020-02-01 20:54:54 +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
dedf81a9af
Merge commit 'e61c3e8bf697e5c5c6cddb4843b24279faaf25cb'
2020-01-31 19:12:32 +00:00
Dylan K. Taylor
25ead18369
Merge commit '7ce6c8aa13bd1e8eb5aa3fe267a0116ab43e9313'
2020-01-31 18:55:49 +00:00
Dylan K. Taylor
055b13a6cf
strip extra blank lines (php-cs-fixer)
2020-01-22 15:14:10 +00:00
Dylan K. Taylor
cd55cdf5c6
Merge commit '9cd6b3e1c7cd81d0a4b0da68d9b3ff026c9f6495'
2020-01-22 15:04:06 +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
96b91af66a
Merge branch 'stable'
2020-01-11 21:41:38 +00:00
Dylan K. Taylor
cda1143a79
Merge branch 'stable'
2020-01-09 17:17:42 +00:00
Dylan K. Taylor
0f718ea28b
Merge commit '8726604899d1a371567141e0831ed570d3233356'
2019-12-25 14:19:35 +00:00
Dylan K. Taylor
b43bd5fb67
PluginCommand: separate CommandExecutor param
...
looking at the code now it's clear that this class combines two jobs into the same class.
closes #3203
2019-12-04 19:14:52 +00:00
Dylan K. Taylor
d3d7709ead
Merge branch 'next-minor'
2019-12-03 11:55:45 +00:00
Dylan K. Taylor
c16337a80f
Merge branch 'stable' with changes
2019-11-09 18:01:04 +00:00
Dylan K. Taylor
cbef2bbc51
move ThreadException to pocketmine\thread namespace
2019-10-29 12:42:38 +00:00
Dylan K. Taylor
6d24760174
Merge branch 'stable'
2019-10-20 21:25:39 +01:00
Dylan K. Taylor
262dbc0346
ParticleCommand: fixup for 6e9d2e1c8af7d9debc6ed14f98e4f54d29753625
2019-09-23 11:54:17 +01:00
Dylan K. Taylor
ad0f100f8e
remove \pocketmine\START_TIME, add Server->getStartTime()
2019-08-25 16:25:27 +01:00
Dylan K. Taylor
39d5903c3e
Remove INT32_MIN and INT32_MAX global constants
2019-08-25 16:09:51 +01:00
Dylan K. Taylor
3274db3ddc
DustParticle constructor now uses Color object
2019-08-19 18:57:26 +01:00
Dylan K. Taylor
2d4a32fc77
first look at separating Entity and Location
2019-08-19 17:20:34 +01:00
Dylan K. Taylor
9598af7683
commands: remove some nonsensical isValid() checks
...
a player who doesn't have a valid world has no business sending commands anyway.
2019-08-06 15:42:17 +01:00
Dylan K. Taylor
5499ac620c
Removed pocketmine subdirectory, map PSR-4 style
2019-07-30 19:14:57 +01:00
