mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/command/defaults/TeleportCommand.php
#	src/pocketmine/event/entity/EntityDespawnEvent.php
#	src/pocketmine/event/entity/EntityInventoryChangeEvent.php
#	src/pocketmine/event/entity/EntityLevelChangeEvent.php
#	src/pocketmine/event/entity/EntitySpawnEvent.php
#	tests/phpstan/configs/actual-problems.neon
This commit is contained in:
Dylan K. Taylor
2020-06-21 00:30:45 +01:00
parent a16de8747e 49d3a42120
commit 1f90aa07aa
24 changed files with 116 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/defaults/TimingsCommand.php
View File

@ -176,6 +176,8 @@ class TimingsCommand extends VanillaCommand{
fclose($fileTimings);
Command::broadcastCommandMessage($sender, new TranslationContainer("pocketmine.command.timings.timingsWrite", [$timings]));
}
}else{
throw new InvalidCommandSyntaxException();
}
return true;