Merge branch 'master' into mcpe-1.0

This commit is contained in:
Dylan K. Taylor 2017-01-09 16:04:11 +00:00
commit 0428894cc6
4 changed files with 45 additions and 3 deletions

2
.gitignore vendored
View File

@ -11,7 +11,7 @@ server.properties
memoryDump_*/*
# Common IDEs
.idea/*
.idea/
nbproject/*
# Windows image file caches

View File

@ -4,7 +4,9 @@
## Creating an Issue
- If you are reporting a bug, **make sure that you are using the latest supported version** before opening an issue.
- If you are reporting a bug:
- **make sure that you are using the latest supported version** before opening an issue.
- **test it on a clean test server, WITHOUT PLUGINS**, to see if the issue still occurs. If not then it may be a plugin issue. Please also indicate the result of such tests.
- [Search the issue tracker](https://github.com/pmmp/PocketMine-MP/issues?utf8=%E2%9C%93&q=is%3Aissue) to check if anyone has already reported it, to avoid needlessly creating duplicate issues. Make sure you also check closed issues, as an issue you think is valid may already have been resolved.

View File

@ -2533,7 +2533,7 @@ class Level implements ChunkManager, Metadatable{
}
/**
* Returns true if the spawn is part of the spawn
* Returns whether the chunk at the specified coordinates is a spawn chunk
*
* @param int $X
* @param int $Z

40
start.ps1 Normal file
View File

@ -0,0 +1,40 @@
param (
[switch]$Loop = $false
)
if(Test-Path "bin\php\php.exe"){
$env:PHPRC = ""
$binary = "bin\php\php.exe"
}else{
$binary = "php"
}
if(Test-Path "PocketMine-MP.phar"){
$file = "PocketMine-MP.phar"
}elseif(Test-Path "src\pocketmine\PocketMine.php"){
$file = "src\pocketmine\PocketMine.php"
}else{
echo "Couldn't find a valid PocketMine-MP installation"
pause
exit 1
}
function StartServer{
$command = $binary + " " + $file + " --enable-ansi"
iex $command
}
$loops = 0
StartServer
while($Loop){
if($loops -ne 0){
echo ("Restarted " + $loops + " times")
}
$loops++
echo "To escape the loop, press CTRL+C now. Otherwise, wait 5 seconds for the server to restart."
echo ""
Start-Sleep 5
StartServer
}