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

Merge branch 'moar-typehints'

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-07-15 09:43:43 +01:00
parent fb5587350d b28128f835
commit 24bdf330d5
176 changed files with 879 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/event/Cancellable.php
View File

@ -31,7 +31,7 @@ interface Cancellable{
/**
* @return bool
*/
public function isCancelled();
public function isCancelled() : bool;
/**
* @param bool $value

10
src/pocketmine/event/Timings.php
View File

@ -176,7 +176,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getPluginTaskTimings(TaskHandler $task, int $period){
public static function getPluginTaskTimings(TaskHandler $task, int $period) : TimingsHandler{
$ftask = $task->getTask();
if($ftask instanceof PluginTask and $ftask->getOwner() !== null){
$plugin = $ftask->getOwner()->getDescription()->getFullName();
@ -208,7 +208,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getEntityTimings(Entity $entity){
public static function getEntityTimings(Entity $entity) : TimingsHandler{
$entityType = (new \ReflectionClass($entity))->getShortName();
if(!isset(self::$entityTypeTimingMap[$entityType])){
if($entity instanceof Player){
@ -226,7 +226,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getTileEntityTimings(Tile $tile){
public static function getTileEntityTimings(Tile $tile) : TimingsHandler{
$tileType = (new \ReflectionClass($tile))->getShortName();
if(!isset(self::$tileEntityTypeTimingMap[$tileType])){
self::$tileEntityTypeTimingMap[$tileType] = new TimingsHandler("** tickTileEntity - " . $tileType, self::$tickTileEntityTimer);
@ -240,7 +240,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getReceiveDataPacketTimings(DataPacket $pk){
public static function getReceiveDataPacketTimings(DataPacket $pk) : TimingsHandler{
if(!isset(self::$packetReceiveTimingMap[$pk::NETWORK_ID])){
$pkName = (new \ReflectionClass($pk))->getShortName();
self::$packetReceiveTimingMap[$pk::NETWORK_ID] = new TimingsHandler("** receivePacket - " . $pkName . " [0x" . dechex($pk::NETWORK_ID) . "]", self::$playerNetworkReceiveTimer);
@ -255,7 +255,7 @@ abstract class Timings{
*
* @return TimingsHandler
*/
public static function getSendDataPacketTimings(DataPacket $pk){
public static function getSendDataPacketTimings(DataPacket $pk) : TimingsHandler{
if(!isset(self::$packetSendTimingMap[$pk::NETWORK_ID])){
$pkName = (new \ReflectionClass($pk))->getShortName();
self::$packetSendTimingMap[$pk::NETWORK_ID] = new TimingsHandler("** sendPacket - " . $pkName . " [0x" . dechex($pk::NETWORK_ID) . "]", self::$playerNetworkTimer);

2
src/pocketmine/event/block/BlockFormEvent.php
View File

@ -23,8 +23,6 @@ declare(strict_types=1);
namespace pocketmine\event\block;
use pocketmine\block\Block;
class BlockFormEvent extends BlockGrowEvent{
public static $handlerList = null;

4
src/pocketmine/event/player/PlayerBucketFillEvent.php
View File

@ -23,10 +23,6 @@ declare(strict_types=1);
namespace pocketmine\event\player;
use pocketmine\block\Block;
use pocketmine\item\Item;
use pocketmine\Player;
class PlayerBucketFillEvent extends PlayerBucketEvent{
public static $handlerList = null;
}

1
src/pocketmine/event/player/PlayerExhaustEvent.php
View File

@ -26,7 +26,6 @@ namespace pocketmine\event\player;
use pocketmine\entity\Human;
use pocketmine\event\Cancellable;
use pocketmine\event\entity\EntityEvent;
use pocketmine\Player;
class PlayerExhaustEvent extends EntityEvent implements Cancellable{
public static $handlerList = null;