mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-18 11:45:30 +00:00
Code Issues Projects Releases Wiki Activity
11,883 Commits 16 Branches 441 Tags
Commit Graph

10536 Commits

Author SHA1 Message Date
Dylan K. Taylor
70ca12bb90 Merge commit 'fcc9e62c6' 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/types/command/CommandEnum.php
#	src/pocketmine/Player.php
 2020-06-13 11:49:52 +01:00
Dylan K. Taylor
fe1b5d2d01 Merge commit '3d50aafcc' 
# Conflicts:
#	resources/vanilla
#	src/crafting/ShapedRecipe.php
 2020-06-13 11:30:44 +01:00
Dylan K. Taylor
da3ba1e2b2 Merge commit 'a27b29897' 
# Conflicts:
#	resources/vanilla
 2020-06-13 11:28:03 +01:00
Dylan K. Taylor
fcc9e62c65 CommandEnum: specify enumValues type 
phpstan 0.12.26 starts reporting errors about the result of array_search() being given to some constructor or another because of the lack of key type specification.
 2020-06-10 10:33:35 +01:00
Dylan K. Taylor
3d50aafcc4 ShapedRecipe: remove a curly-brace array-access that nothing noticed 2020-06-06 11:12:45 +01:00
Dylan K. Taylor
a27b29897c TimingsCommand: tell operators what's going on for audit purposes 
previously nobody except the person who was managing timings would know that timings was running, being pasted or whatever else. Since timings can impact performance (and, for example, block the main thread when writing timings to a file), access to it should be logged so that server owners know what's going on.
 2020-06-05 11:12:36 +01:00
Dylan K. Taylor
dfbd857771 3.13.1 is next 2020-06-04 20:01:28 +01:00
Dylan K. Taylor
323d96d5c1 Release 3.13.0 2020-06-04 20:01:27 +01:00
Dylan K. Taylor
f495ba1d0b Merge branch 'next-minor' into stable 2020-06-04 19:59:46 +01:00
Dylan K. Taylor
643cf0ebf8 3.12.7 is next 2020-06-04 19:55:09 +01:00
Dylan K. Taylor
1614206a6d Release 3.12.6 2020-06-04 19:55:09 +01:00
Dylan K. Taylor
c29ed34b54 Merge commit 'f4ee2912db89c6629d4fa191e993f0798035ef20' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Server.php
 2020-06-04 14:13:23 +01:00
Dylan K. Taylor
0a3bd6fe78 Merge commit 'a0de9b0d4' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-04 14:11:00 +01:00
Dylan K. Taylor
fcc2352203 Merge commit '03e8cd3ed' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-04 14:07:55 +01:00
Dylan K. Taylor
3e9018a838 Merge commit '7af4e70f6' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/entity/Entity.php
 2020-06-04 14:02:00 +01:00
Dylan K. Taylor
0ae2c6302a Merge branch 'stable' into next-minor 2020-06-04 13:59:30 +01:00
Dylan K. Taylor
f4ee2912db Server: tell me what is wrong when crash archive submission fails 2020-06-04 13:48:40 +01:00
Dylan K. Taylor
a0de9b0d46 Player: use real time to update rate limit, fixes #3554 (except in very extreme cases) 2020-06-04 13:39:26 +01:00
Dylan K. Taylor
03e8cd3ed4 Player: fixing ground state handling in spectator mode, closes #3552, closes #3553 2020-06-04 11:10:21 +01:00
Dylan K. Taylor
7af4e70f64 Entity: fixed movement updates not firing after teleport 
this became obvious by teleporting non-moving entities into the air and observing that they didn't fall.
 2020-06-04 10:52:04 +01:00
Dylan K. Taylor
017afead3b extract FurnaceRecipeManager unit from CraftingManager 
I'd like to have this directly provided to Furnace, but I don't know how to short of making into a singleton. Since I want to have per-furnace recipe managers (e.g. for stuff like blast furnace vs regular furnace etc), a singleton isn't really an option.
 2020-06-03 18:59:59 +01:00
Dylan K. Taylor
b58c425189 Merge branch 'next-minor' 
# Conflicts:
#	changelogs/3.12.md
#	resources/vanilla
#	src/VersionInfo.php
 2020-06-03 13:11:30 +01:00
Dylan K. Taylor
c864647cd1 Merge branch 'stable' into next-minor 2020-06-03 13:04:08 +01:00
Dylan K. Taylor
d2d4780653 Merge commit 'a3f633862' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 13:03:23 +01:00
Dylan K. Taylor
7d7c16b764 Merge commit '21aef97ba' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 13:00:31 +01:00
Dylan K. Taylor
01cbd27485 Merge commit 'd64561b0b' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 12:57:20 +01:00
Dylan K. Taylor
b2f182b196 Merge commit 'd234d3e45' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/command/defaults/ParticleCommand.php
 2020-06-03 12:55:46 +01:00
Dylan K. Taylor
90b53149d7 Merge commit '5056754ce' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 12:54:00 +01:00
Dylan K. Taylor
5b0964cec8 Merge commit '2dc3cf816' 
# Conflicts:
#	resources/vanilla
 2020-06-03 12:52:42 +01:00
Dylan K. Taylor
2bf73c7a4a Merge commit '8c5a81cf5' 
# Conflicts:
#	resources/vanilla
 2020-06-03 12:50:09 +01:00
Dylan K. Taylor
e7d712aeb6 Merge commit '2b58f2baf' 
# Conflicts:
#	resources/vanilla
#	src/entity/object/FallingBlock.php
 2020-06-03 12:47:44 +01:00
Dylan K. Taylor
c72937a4af Merge commit '5dadf1237' 
# Conflicts:
#	resources/vanilla
 2020-06-03 12:46:06 +01:00
Dylan K. Taylor
544bcb8f12 Merge commit '0d4e473bd' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
 2020-06-03 12:45:28 +01:00
Dylan K. Taylor
e250553670 Merge commit '3f2455f09' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/block/SnowLayer.php
 2020-06-03 12:43:36 +01:00
Dylan K. Taylor
d7ae86b30c Merge commit '9d26a224a' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/block/DoublePlant.php
 2020-06-03 12:35:59 +01:00
Dylan K. Taylor
899da1b7f7 Merge commit '42e14f749' 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php
#	src/pocketmine/item/Bow.php
#	src/world/World.php
 2020-06-03 12:31:17 +01:00
Dylan K. Taylor
92ed9e6125 3.12.6 is next 2020-06-03 10:59:33 +01:00
Dylan K. Taylor
c32026333f Release 3.12.5 2020-06-03 10:59:33 +01:00
Dylan K. Taylor
915224c8e5 Living: fix being unable to die in the void 2020-06-02 23:18:40 +01:00
Dylan K. Taylor
734bc6c4a7 3.12.5 is next 2020-06-02 18:40:33 +01:00
Dylan K. Taylor
d36b24c518 Release 3.12.4 2020-06-02 18:40:33 +01:00
Dylan K. Taylor
d554d8060b fixed absorption hearts not being consumed, closes #3546 
this was caused by a bad fix for switching. we can't consider zero-damage attacks as cancelled because zero-damage might have been the result of things like consuming absorption hearts, so the aftereffects need to be processed even when the net damage is zero.
 2020-06-02 10:09:18 +01:00
Dylan K. Taylor
3be83e09f2 Revert BC-breaking backport from b38c81c96 
this can't be applied to a minor version because it places additional requirements on the Inventory contract.
 2020-06-01 13:51:36 +01:00
Dylan K. Taylor
f24be2b055 Merge branch 'stable' into next-minor 
# Conflicts:
#	src/pocketmine/Player.php
#	src/pocketmine/block/SnowLayer.php
 2020-06-01 13:42:59 +01:00
Dylan K. Taylor
92cffc00d0 3.12.4 is next 2020-06-01 13:18:28 +01:00
Dylan K. Taylor
e87e974323 Release 3.12.3 2020-06-01 13:18:28 +01:00
Dylan K. Taylor
a3f6338626 Player: fixed internal server error when using insert-before on a client-sided book page 2020-06-01 12:59:18 +01:00
Dylan K. Taylor
21aef97ba7 Player: fixed swapping book pages that only exist client-side, closes #3322 2020-06-01 12:50:39 +01:00
Dylan K. Taylor
ed0d1978aa WritableBook: fixed thrown exception when asking for a page that doesn't exist (it's allowed to return null for a reason ...) 2020-06-01 12:46:41 +01:00
Dylan K. Taylor
d64561b0b1 Fixed internal server error when deleting book pages that only exist client side 2020-06-01 12:39:17 +01:00