diff --git a/README.md b/README.md index 8e971bda..452dd875 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # NostalgiaCore -NostalgiaCore is a fork of Legacy PocketMine-MP 1.3.11, which is fixing bugs of Legacy PocketMine-MP, and brings a *new* live into it. +NostalgiaCore is a fork of Legacy PocketMine-MP 1.3.12, which is fixing bugs of Legacy PocketMine-MP, and brings a *new* live into it. Supported version: 0.8.1 @@ -30,8 +30,9 @@ Supported version: 0.8.1 * __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__ * __[PHP SQLite3](http://php.net/manual/en/book.sqlite3.php)__ * __[PHP BCMath](http://php.net/manual/en/book.bc.php)__ -* __[PHP pthreads](https://github.com/krakjoe/pthreads)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything. -* __[Spyc](https://github.com/mustangostang/spyc/blob/master/Spyc.php)__ by _[Vlad Andersen](https://github.com/mustangostang)_: A simple YAML loader/dumper class for PHP. +* __[PHP pthreads](http://pthreads.org/)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything. +* __[PHP YAML](https://code.google.com/p/php-yaml/)__ by _Bryan Davis_: The Yaml PHP Extension provides a wrapper to the LibYAML library. +* __[LibYAML](http://pyyaml.org/wiki/LibYAML)__ by _Kirill Simonov_: A YAML 1.1 parser and emitter written in C. * __[mintty](https://code.google.com/p/mintty/)__ : xterm Terminal Emulator * __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax * __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library diff --git a/bin4win/php/libevent.dll b/bin4win/php/libevent.dll new file mode 100644 index 00000000..698f07a7 Binary files /dev/null and b/bin4win/php/libevent.dll differ diff --git a/bin4win/php/php.ini b/bin4win/php/php.ini index 6ee510e4..53c6de08 100644 --- a/bin4win/php/php.ini +++ b/bin4win/php/php.ini @@ -727,7 +727,7 @@ user_dir = ; http://php.net/extension-dir ; extension_dir = "./" ; On windows: -extension_dir = "ext" +extension_dir = "./" ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically @@ -838,10 +838,13 @@ default_socket_timeout = 30 ;;;;;;;;;;;;;;;;;;;;;; ; Dynamic Extensions ; ;;;;;;;;;;;;;;;;;;;;;; +extension=php_event.dll extension=php_curl.dll +extension=php_mysqli.dll extension=php_sqlite3.dll extension=php_sockets.dll extension=php_shmop.dll +extension=php_yaml.dll extension=php_pthreads.dll extension=php_com_dotnet.dll @@ -1150,7 +1153,7 @@ mysqli.default_user = mysqli.default_pw = ; Allow or prevent reconnect -mysqli.reconnect = Off +mysqli.reconnect = On [mysqlnd] ; Enable / Disable collection of general statistics by mysqlnd which can be diff --git a/bin4win/php/php_com_dotnet.dll b/bin4win/php/php_com_dotnet.dll new file mode 100644 index 00000000..baf55c5b Binary files /dev/null and b/bin4win/php/php_com_dotnet.dll differ diff --git a/bin4win/php/php_curl.dll b/bin4win/php/php_curl.dll new file mode 100644 index 00000000..c46139a8 Binary files /dev/null and b/bin4win/php/php_curl.dll differ diff --git a/bin4win/php/php_event.dll b/bin4win/php/php_event.dll new file mode 100644 index 00000000..18d2d3d2 Binary files /dev/null and b/bin4win/php/php_event.dll differ diff --git a/bin4win/php/php_mysqli.dll b/bin4win/php/php_mysqli.dll new file mode 100644 index 00000000..4fb185a3 Binary files /dev/null and b/bin4win/php/php_mysqli.dll differ diff --git a/bin4win/php/php_pthreads.dll b/bin4win/php/php_pthreads.dll new file mode 100644 index 00000000..fbb969e2 Binary files /dev/null and b/bin4win/php/php_pthreads.dll differ diff --git a/bin4win/php/php_shmop.dll b/bin4win/php/php_shmop.dll new file mode 100644 index 00000000..db368855 Binary files /dev/null and b/bin4win/php/php_shmop.dll differ diff --git a/bin4win/php/php_sockets.dll b/bin4win/php/php_sockets.dll new file mode 100644 index 00000000..ef7b3717 Binary files /dev/null and b/bin4win/php/php_sockets.dll differ diff --git a/bin4win/php/php_sqlite3.dll b/bin4win/php/php_sqlite3.dll new file mode 100644 index 00000000..204fe189 Binary files /dev/null and b/bin4win/php/php_sqlite3.dll differ diff --git a/bin4win/php/php_yaml.dll b/bin4win/php/php_yaml.dll new file mode 100644 index 00000000..e9d96e7e Binary files /dev/null and b/bin4win/php/php_yaml.dll differ diff --git a/bin4win/php/yaml.dll b/bin4win/php/yaml.dll new file mode 100644 index 00000000..79d4615c Binary files /dev/null and b/bin4win/php/yaml.dll differ diff --git a/bin4win/pocketmine.ico b/bin4win/pocketmine.ico index 1c6cf123..d08e4b02 100644 Binary files a/bin4win/pocketmine.ico and b/bin4win/pocketmine.ico differ diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index 473442e2..9446705b 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -147,7 +147,7 @@ class ServerAPI{ //Load advanced properties define("DEBUG", $this->getProperty("debug", 1)); define("ADVANCED_CACHE", $this->getProperty("enable-advanced-cache", false)); - define("MAX_CHUNK_RATE", 20 / $this->getProperty("max-chunks-per-second", 8)); //Default rate ~512 kB/s + //define("MAX_CHUNK_RATE", 20 / $this->getProperty("max-chunks-per-second", 8)); //Default rate ~512 kB/s if(ADVANCED_CACHE == true){ console("[INFO] Advanced cache enabled"); } diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 3c1e47e7..a476e93b 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -64,7 +64,7 @@ class PocketMinecraftServer{ $this->saveEnabled = true; $this->tickMeasure = array_fill(0, 40, 0); $this->setType("normal"); - $this->interface = new MinecraftInterface($this, "255.255.255.255", $this->port, true, false, $this->serverip); + $this->interface = new MinecraftInterface("255.255.255.255", $this->port, $this->serverip); $this->stop = false; $this->ticks = 0; if(!defined("NO_THREADS")){ diff --git a/src/config.php b/src/config.php index 83b3f24a..f6fd20b8 100644 --- a/src/config.php +++ b/src/config.php @@ -67,7 +67,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH); ini_set("memory_limit", "128M"); //Default define("LOG", true); define("START_TIME", microtime(true)); -define("MAJOR_VERSION", "Alpha_1.3.11"); +define("MAJOR_VERSION", "Alpha_1.3.12"); define("CODENAME", "懐かしさ (Nostalgia)"); //i'm not very creative - kotyaralih define("CURRENT_MINECRAFT_VERSION", "v0.8.1 alpha"); define("CURRENT_API_VERSION", 12);