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

PHP7 to master

Browse Source
This commit is contained in:
Intyre
2016-02-21 12:47:30 +01:00
parent fc42fc534b 9acbd85b25
commit a6cd526e60
153 changed files with 2836 additions and 3536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/pocketmine/event/entity/EntityMoveEvent.php
View File

@ -1,48 +0,0 @@
<?php
/**
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\event\entity;
use pocketmine\entity\Entity;
use pocketmine\Event;
use pocketmine\event\Cancellable;
use pocketmine\math\Vector3;
/**
* @deprecated
*/
class EntityMoveEvent extends EntityEvent implements Cancellable{
public static $handlerList = null;
/** @var \pocketmine\math\Vector3 */
private $pos;
public function __construct(Entity $entity, Vector3 $pos){
$this->entity = $entity;
$this->pos = $pos;
}
public function getVector(){
return $this->pos;
}
}

14
src/pocketmine/event/player/PlayerChatEvent.php
View File

@ -46,13 +46,6 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
$this->player = $player;
$this->message = $message;
//TODO: @deprecated (backwards-compativility)
$i = 0;
while(($pos = strpos($format, "%s")) !== false){
$format = substr($format, 0, $pos) . "{%$i}" . substr($format, $pos + 2);
++$i;
}
$this->format = $format;
if($recipients === null){
@ -84,13 +77,6 @@ class PlayerChatEvent extends PlayerEvent implements Cancellable{
}
public function setFormat($format){
//TODO: @deprecated (backwards-compativility)
$i = 0;
while(($pos = strpos($format, "%s")) !== false){
$format = substr($format, 0, $pos) . "{%$i}" . substr($format, $pos + 2);
++$i;
}
$this->format = $format;
}

2
src/pocketmine/event/server/QueryRegenerateEvent.php
View File

@ -53,7 +53,7 @@ class QueryRegenerateEvent extends ServerEvent{
public function __construct(Server $server, $timeout = 5){
$this->timeout = $timeout;
$this->serverName = $server->getServerName();
$this->serverName = $server->getMotd();
$this->listPlugins = $server->getProperty("settings.query-plugins", true);
$this->plugins = $server->getPluginManager()->getPlugins();
$this->players = [];