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

Merge branch 'master' of https://github.com/shoghicp/PocketMine-MP

Browse Source
This commit is contained in:
Michael Yoo 2013-02-09 20:44:00 +10:30
commit d0057b6595
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -2,11 +2,6 @@ language: php
php: php:
- 5.4 - 5.4
- 5.5
matrix:
allow_failures:
- php: 5.5
before_script: before_script:
- sudo pecl install channel://pecl.php.net/pthreads-0.0.42 - sudo pecl install channel://pecl.php.net/pthreads-0.0.42

2
src/API/BanAPI.php
View File

@ -138,7 +138,7 @@ class BanAPI{
$output .= "Player \"$user\" added to white-list\n"; $output .= "Player \"$user\" added to white-list\n";
break; break;
case "reload": case "reload":
$this->whitelist = $this->load(FILE_PATH."white-list.txt", CONFIG_LIST); $this->whitelist = new Config(FILE_PATH."white-list.txt", CONFIG_LIST);
break; break;
case "list": case "list":
$output .= "White-list: ".implode(", ", $this->whitelist->getAll(true))."\n"; $output .= "White-list: ".implode(", ", $this->whitelist->getAll(true))."\n";