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

Merge master into mcpe-1.0

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-01-21 13:43:41 +00:00
commit 50b9034e16
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pocketmine/CrashDump.php
View File

@ -41,7 +41,10 @@ class CrashDump{
public function __construct(Server $server){ public function __construct(Server $server){
$this->time = time(); $this->time = time();
$this->server = $server; $this->server = $server;
$this->path = $this->server->getDataPath() . "CrashDump_" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log"; if(!is_dir($this->server->getDataPath()) . "crashdumps"){
mkdir($this->server->getDataPath() . "crashdumps");
}
$this->path = $this->server->getDataPath() . "crashdumps/" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
$this->fp = @fopen($this->path, "wb"); $this->fp = @fopen($this->path, "wb");
if(!is_resource($this->fp)){ if(!is_resource($this->fp)){
throw new \RuntimeException("Could not create Crash Dump"); throw new \RuntimeException("Could not create Crash Dump");

2
src/pocketmine/Player.php
View File

@ -1917,7 +1917,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->forceMovement = new Vector3($this->x, $this->y, $this->z); $this->forceMovement = new Vector3($this->x, $this->y, $this->z);
} }
if($this->forceMovement instanceof Vector3 and (($dist = $newPos->distanceSquared($this->forceMovement)) > 0.1 or $revert)){ if($this->forceMovement instanceof Vector3 and ($newPos->distanceSquared($this->forceMovement) > 0.1 or $revert)){
$this->sendPosition($this->forceMovement, $packet->yaw, $packet->pitch, MovePlayerPacket::MODE_RESET); $this->sendPosition($this->forceMovement, $packet->yaw, $packet->pitch, MovePlayerPacket::MODE_RESET);
}else{ }else{
$packet->yaw %= 360; $packet->yaw %= 360;

2
src/pocketmine/command/defaults/HelpCommand.php
View File

@ -61,7 +61,7 @@ class HelpCommand extends VanillaCommand{
if($sender instanceof ConsoleCommandSender){ if($sender instanceof ConsoleCommandSender){
$pageHeight = PHP_INT_MAX; $pageHeight = PHP_INT_MAX;
}else{ }else{
$pageHeight = 5; $pageHeight = 7;
} }
if($command === ""){ if($command === ""){