Updated dependency versions

Yes, I am not happy about this either. new-versioning has issues, and there hasn't been enough development and testing on it.
I didn't want to delay release to cram in a half-baked new versioning system, and it's ended up delayed anyway and new-versioning is still half-baked.
we're overdue a new release, so here it is.

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Issue description
 <!---
-THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below. 
+THIS ISSUE TRACKER IS FOR BUG REPORTING, NOT FOR HELP & SUPPORT. If you need help, use the links below.
 - http://pmmp.readthedocs.io/en/rtfd/ - Documentation
 - https://forums.pmmp.io - PMMP Forums
 
@@ -28,7 +28,7 @@ NO support whatsoever will be provided for third-party modified variants of Pock
 
 Note that 32-bit platforms are no longer supported by PocketMine-MP and issues concerning 32-bit platforms will be closed.
 -->
-* PocketMine-MP:
+* PocketMine-MP: <!-- LATEST IS NOT A VALID VERSION -->
 * PHP:
 * Server OS:
 * Game version: PE/Win10 (delete as appropriate)
@@ -43,6 +43,6 @@ If the issue is **not** reproducible without plugins:
 
 ### Crashdump, backtrace or other files
 - Do not paste crashdumps into an issue - please use our Crash Archive at https://crash.pmmp.io for submitting crash reports to not spam the issue tracker. Add links to your reports in the Crash Archive here.
-- Please use gist or anything else to add other files and add links here 
+- Please use gist or anything else to add other files and add links here
 
 * ...

.github/support.yml

@@ -0,0 +1,12 @@
+# Configuration for support-requests - https://github.com/dessant/support-requests
+
+# Label used to mark issues as support requests
+supportLabel: "Support request"
+# Comment to post on issues marked as support requests. Add a link
+# to a support page, or set to `false` to disable
+supportComment: >
+  This issue tracker is not a support forum. Please use the [forums](https://forums.pmmp.io) for support.
+# Whether to close issues marked as support requests
+close: true
+# Whether to lock issues marked as support requests
+lock: false

.gitignore

@@ -9,7 +9,7 @@ crashdumps/*
 *.phar
 server.properties
 /pocketmine.yml
-memoryDump_*/*
+memory_dumps/*
 resource_packs/
 
 # Common IDEs

composer.json

@@ -5,7 +5,7 @@
    "homepage": "https://pmmp.io",
    "license": "LGPL-3.0",
    "require": {
-      "php": ">=7.2.0RC3",
+      "php": ">=7.2.0",
       "ext-bcmath": "*",
       "ext-curl": "*",
       "ext-hash": "*",
@@ -21,13 +21,14 @@
       "ext-yaml": ">=2.0.0",
       "ext-zip": "*",
       "ext-zlib": ">=1.2.11",
-      "pocketmine/raklib": "dev-master#eaa85c2b23bbc1a85030a621d4644c0e33e05950",
-      "pocketmine/pocketmine-spl": "^0.2.0",
-      "pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887",
-      "pocketmine/pocketmine-nbt": "dev-master#f8934c0aed90d1f55452588f7ebef7c4519518a5"
+      "pocketmine/raklib": "0.11.0",
+      "pocketmine/spl": "0.3.0",
+      "pocketmine/binaryutils": "0.0.1",
+      "pocketmine/nbt": "0.1.0",
+      "pocketmine/math": "0.1.0"
    },
    "autoload": {
-      "psr-0": {
+      "psr-4": {
          "": ["src"]
       }
    },
@@ -38,15 +39,19 @@
       },
       {
          "type": "vcs",
-         "url": "https://github.com/pmmp/PocketMine-SPL"
+         "url": "https://github.com/pmmp/SPL"
       },
       {
          "type": "vcs",
-         "url": "https://github.com/pmmp/PocketMine-BinaryUtils"
+         "url": "https://github.com/pmmp/BinaryUtils"
       },
       {
          "type": "vcs",
-         "url": "https://github.com/pmmp/PocketMine-NBT"
+         "url": "https://github.com/pmmp/NBT"
+      },
+      {
+         "type": "vcs",
+         "url": "https://github.com/pmmp/Math"
       }
    ]
 }

composer.lock

@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "5997f272811ed1148e7699a33335a0d2",
+    "content-hash": "401dbada37e501304f05b0f1fa818953",
     "packages": [
         {
-            "name": "pocketmine/pocketmine-binaryutils",
-            "version": "dev-master",
+            "name": "pocketmine/binaryutils",
+            "version": "0.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/PocketMine-BinaryUtils.git",
-                "reference": "a7cd5303a3b215d26bf9be76682ce9311f40e887"
+                "url": "https://github.com/pmmp/BinaryUtils.git",
+                "reference": "03e6851f814aba96487ec64181a6ae948edd9f7a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/PocketMine-BinaryUtils/zipball/a7cd5303a3b215d26bf9be76682ce9311f40e887",
-                "reference": "a7cd5303a3b215d26bf9be76682ce9311f40e887",
+                "url": "https://api.github.com/repos/pmmp/BinaryUtils/zipball/03e6851f814aba96487ec64181a6ae948edd9f7a",
+                "reference": "03e6851f814aba96487ec64181a6ae948edd9f7a",
                 "shasum": ""
             },
             "require": {
@@ -34,28 +34,61 @@
             ],
             "description": "Classes and methods for conveniently handling binary data",
             "support": {
-                "source": "https://github.com/pmmp/PocketMine-BinaryUtils/tree/master",
-                "issues": "https://github.com/pmmp/PocketMine-BinaryUtils/issues"
+                "source": "https://github.com/pmmp/BinaryUtils/tree/master",
+                "issues": "https://github.com/pmmp/BinaryUtils/issues"
             },
-            "time": "2018-01-14T18:53:25+00:00"
+            "time": "2018-03-17T11:57:06+00:00"
         },
         {
-            "name": "pocketmine/pocketmine-nbt",
-            "version": "dev-master",
+            "name": "pocketmine/math",
+            "version": "0.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/PocketMine-NBT.git",
-                "reference": "f8934c0aed90d1f55452588f7ebef7c4519518a5"
+                "url": "https://github.com/pmmp/Math.git",
+                "reference": "1df74f0352309a9c1e6728fa416a3f0493d07b16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/PocketMine-NBT/zipball/f8934c0aed90d1f55452588f7ebef7c4519518a5",
-                "reference": "f8934c0aed90d1f55452588f7ebef7c4519518a5",
+                "url": "https://api.github.com/repos/pmmp/Math/zipball/1df74f0352309a9c1e6728fa416a3f0493d07b16",
+                "reference": "1df74f0352309a9c1e6728fa416a3f0493d07b16",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "pocketmine\\math\\": "src/"
+                }
+            },
+            "license": [
+                "LGPL-3.0"
+            ],
+            "description": "PHP library containing math related code used in PocketMine-MP",
+            "support": {
+                "source": "https://github.com/pmmp/Math/tree/master",
+                "issues": "https://github.com/pmmp/Math/issues"
+            },
+            "time": "2018-03-18T18:01:56+00:00"
+        },
+        {
+            "name": "pocketmine/nbt",
+            "version": "0.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/NBT.git",
+                "reference": "d79f8615442887bb45cfacdb52e1e6eb47c38fd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/NBT/zipball/d79f8615442887bb45cfacdb52e1e6eb47c38fd7",
+                "reference": "d79f8615442887bb45cfacdb52e1e6eb47c38fd7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.0",
-                "pocketmine/pocketmine-binaryutils": "dev-master#8bb34e771fee69abcc5482d17d2fa0b4f0e15a5e"
+                "pocketmine/binaryutils": "0.0.1"
             },
             "type": "library",
             "autoload": {
@@ -63,28 +96,71 @@
                     "pocketmine\\nbt\\": "src/"
                 }
             },
+            "autoload-dev": {
+                "psr-4": {
+                    "pocketmine\\nbt\\": "tests/phpunit/"
+                }
+            },
             "license": [
                 "LGPL-3.0"
             ],
             "description": "PHP library for working with Named Binary Tags",
             "support": {
-                "source": "https://github.com/pmmp/PocketMine-NBT/tree/master",
-                "issues": "https://github.com/pmmp/PocketMine-NBT/issues"
+                "source": "https://github.com/pmmp/NBT/tree/0.1.0",
+                "issues": "https://github.com/pmmp/NBT/issues"
             },
-            "time": "2018-01-11T13:51:50+00:00"
+            "time": "2018-04-13T18:43:03+00:00"
         },
         {
-            "name": "pocketmine/pocketmine-spl",
-            "version": "0.2.0",
+            "name": "pocketmine/raklib",
+            "version": "0.11.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pmmp/PocketMine-SPL.git",
-                "reference": "70c591a44b6c5aa541a1a55585764bed2b23148c"
+                "url": "https://github.com/pmmp/RakLib.git",
+                "reference": "1da1b4c6cc6bd5337ce5e468d22bbb013ae02b43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/PocketMine-SPL/zipball/70c591a44b6c5aa541a1a55585764bed2b23148c",
-                "reference": "70c591a44b6c5aa541a1a55585764bed2b23148c",
+                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/1da1b4c6cc6bd5337ce5e468d22bbb013ae02b43",
+                "reference": "1da1b4c6cc6bd5337ce5e468d22bbb013ae02b43",
+                "shasum": ""
+            },
+            "require": {
+                "ext-bcmath": "*",
+                "ext-pthreads": ">=3.1.7dev",
+                "ext-sockets": "*",
+                "php": ">=7.2.0RC3",
+                "pocketmine/binaryutils": "0.0.1",
+                "pocketmine/spl": "0.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./"
+                ]
+            },
+            "license": [
+                "GPL-3.0"
+            ],
+            "description": "A RakNet server implementation written in PHP",
+            "support": {
+                "source": "https://github.com/pmmp/RakLib/tree/0.11.0",
+                "issues": "https://github.com/pmmp/RakLib/issues"
+            },
+            "time": "2018-04-13T19:05:24+00:00"
+        },
+        {
+            "name": "pocketmine/spl",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pmmp/SPL.git",
+                "reference": "ee32424c100fd11ae7f7b8df7604623fd475f0ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pmmp/SPL/zipball/ee32424c100fd11ae7f7b8df7604623fd475f0ec",
+                "reference": "ee32424c100fd11ae7f7b8df7604623fd475f0ec",
                 "shasum": ""
             },
             "type": "library",
@@ -101,63 +177,21 @@
             ],
             "description": "Standard library files required by PocketMine-MP and related projects",
             "support": {
-                "source": "https://github.com/pmmp/PocketMine-SPL/tree/master"
+                "source": "https://github.com/pmmp/SPL/tree/master"
             },
-            "time": "2018-01-11T13:03:01+00:00"
-        },
-        {
-            "name": "pocketmine/raklib",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pmmp/RakLib.git",
-                "reference": "eaa85c2b23bbc1a85030a621d4644c0e33e05950"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/RakLib/zipball/eaa85c2b23bbc1a85030a621d4644c0e33e05950",
-                "reference": "eaa85c2b23bbc1a85030a621d4644c0e33e05950",
-                "shasum": ""
-            },
-            "require": {
-                "ext-bcmath": "*",
-                "ext-pthreads": ">=3.1.7dev",
-                "ext-sockets": "*",
-                "php": ">=7.2.0RC3",
-                "pocketmine/pocketmine-binaryutils": "dev-master#a7cd5303a3b215d26bf9be76682ce9311f40e887",
-                "pocketmine/pocketmine-spl": "^0.2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./"
-                ]
-            },
-            "license": [
-                "GPL-3.0"
-            ],
-            "description": "A RakNet server implementation written in PHP",
-            "support": {
-                "source": "https://github.com/pmmp/RakLib/tree/master",
-                "issues": "https://github.com/pmmp/RakLib/issues"
-            },
-            "time": "2018-01-27T15:38:43+00:00"
+            "time": "2018-03-17T11:56:20+00:00"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "php": 5,
-        "ext-pthreads": 20,
-        "pocketmine/raklib": 20,
-        "pocketmine/pocketmine-binaryutils": 20,
-        "pocketmine/pocketmine-nbt": 20
+        "ext-pthreads": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.2.0RC3",
+        "php": ">=7.2.0",
         "ext-bcmath": "*",
         "ext-curl": "*",
         "ext-hash": "*",

doxygen.conf

@@ -44,7 +44,7 @@ PROJECT_NUMBER         = "PM_VERSION - API PM_API"
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = 
+PROJECT_BRIEF          =
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
@@ -151,7 +151,7 @@ FULL_PATH_NAMES        = NO
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_INC_PATH    =
 
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
@@ -218,13 +218,13 @@ TAB_SIZE               = 4
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-ALIASES                = 
+ALIASES                =
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
 # will allow you to use the command class in the itcl::class meaning.
 
-TCL_SUBST              = 
+TCL_SUBST              =
 
 # Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
 # only. Doxygen will then generate output that is more tailored for C. For
@@ -268,7 +268,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING      = 
+EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -600,7 +600,7 @@ GENERATE_DEPRECATEDLIST= YES
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.
 
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 
 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
 # initial value of a variable or macro / define can have for it to appear in the
@@ -642,7 +642,7 @@ SHOW_NAMESPACES        = YES
 # by doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
-FILE_VERSION_FILTER    = 
+FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
@@ -655,7 +655,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = 
+LAYOUT_FILE            =
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -666,7 +666,7 @@ LAYOUT_FILE            =
 # search path. Do not use file names with spaces, bibtex cannot handle them. See
 # also \cite for info how to create references.
 
-CITE_BIB_FILES         = 
+CITE_BIB_FILES         =
 
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
@@ -725,7 +725,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # messages should be written. If left blank the output is written to standard
 # error (stderr).
 
-WARN_LOGFILE           = 
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
@@ -774,7 +774,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -804,13 +804,13 @@ EXCLUDE_PATTERNS       = */bin/* \
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        = 
+EXCLUDE_SYMBOLS        =
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           = 
+EXAMPLE_PATH           =
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -830,7 +830,7 @@ EXAMPLE_RECURSIVE      = NO
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = 
+IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -847,7 +847,7 @@ IMAGE_PATH             =
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
 
-INPUT_FILTER           = 
+INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
 # basis. Doxygen will compare the file name with each pattern and apply the
@@ -856,7 +856,7 @@ INPUT_FILTER           =
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
 
-FILTER_PATTERNS        = 
+FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER ) will also be used to filter the input files that are used for
@@ -871,7 +871,7 @@ FILTER_SOURCE_FILES    = NO
 # *.ext= (so without naming a filter).
 # This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
 
-FILTER_SOURCE_PATTERNS = 
+FILTER_SOURCE_PATTERNS =
 
 # If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
 # is part of the input, its contents will be placed on the main page
@@ -983,7 +983,7 @@ CLANG_ASSISTED_PARSING = NO
 # specified with INPUT and INCLUDE_PATH.
 # This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
 
-CLANG_OPTIONS          = 
+CLANG_OPTIONS          =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
@@ -1009,7 +1009,7 @@ COLS_IN_ALPHA_INDEX    = 5
 # while generating the index headers.
 # This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the HTML output
@@ -1053,7 +1053,7 @@ HTML_FILE_EXTENSION    = .html
 # of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_HEADER            = 
+HTML_HEADER            =
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
 # generated HTML page. If the tag is left blank doxygen will generate a standard
@@ -1063,7 +1063,7 @@ HTML_HEADER            =
 # that doxygen normally uses.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_FOOTER            = 
+HTML_FOOTER            =
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1075,7 +1075,7 @@ HTML_FOOTER            =
 # obsolete.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_STYLESHEET        = 
+HTML_STYLESHEET        =
 
 # The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
 # defined cascading style sheet that is included after the standard style sheets
@@ -1086,7 +1086,7 @@ HTML_STYLESHEET        =
 # see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = 
+HTML_EXTRA_STYLESHEET  =
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1096,7 +1096,7 @@ HTML_EXTRA_STYLESHEET  =
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = 
+HTML_EXTRA_FILES       =
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the stylesheet and background images according to
@@ -1224,7 +1224,7 @@ GENERATE_HTMLHELP      = NO
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = 
+CHM_FILE               =
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler ( hhc.exe). If non-empty
@@ -1232,7 +1232,7 @@ CHM_FILE               =
 # The file has to be specified with full path.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-HHC_LOCATION           = 
+HHC_LOCATION           =
 
 # The GENERATE_CHI flag controls if a separate .chi index file is generated (
 # YES) or that it should be included in the master .chm file ( NO).
@@ -1245,7 +1245,7 @@ GENERATE_CHI           = NO
 # and project file content.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_INDEX_ENCODING     = 
+CHM_INDEX_ENCODING     =
 
 # The BINARY_TOC flag controls whether a binary table of contents is generated (
 # YES) or a normal table of contents ( NO) in the .chm file.
@@ -1275,7 +1275,7 @@ GENERATE_QHP           = NO
 # the HTML output folder.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QCH_FILE               = 
+QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
@@ -1300,7 +1300,7 @@ QHP_VIRTUAL_FOLDER     = doc
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_NAME   = 
+QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
@@ -1308,21 +1308,21 @@ QHP_CUST_FILTER_NAME   =
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_CUST_FILTER_ATTRS  = 
+QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
 # http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHP_SECT_FILTER_ATTRS  = 
+QHP_SECT_FILTER_ATTRS  =
 
 # The QHG_LOCATION tag can be used to specify the location of Qt's
 # qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
 # generated .qhp file.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
-QHG_LOCATION           = 
+QHG_LOCATION           =
 
 # If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
 # generated, together with the HTML files, they form an Eclipse help plugin. To
@@ -1455,7 +1455,7 @@ MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_EXTENSIONS     = 
+MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
 # of code that will be used on startup of the MathJax code. See the MathJax site
@@ -1463,7 +1463,7 @@ MATHJAX_EXTENSIONS     =
 # example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
-MATHJAX_CODEFILE       = 
+MATHJAX_CODEFILE       =
 
 # When the SEARCHENGINE tag is enabled doxygen will generate a search box for
 # the HTML output. The underlying search engine uses javascript and DHTML and
@@ -1523,7 +1523,7 @@ EXTERNAL_SEARCH        = NO
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-SEARCHENGINE_URL       = 
+SEARCHENGINE_URL       =
 
 # When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
 # search data is written to a file for indexing by an external tool. With the
@@ -1539,7 +1539,7 @@ SEARCHDATA_FILE        = searchdata.xml
 # projects and redirect the results back to the right project.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH_ID     = 
+EXTERNAL_SEARCH_ID     =
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
@@ -1549,7 +1549,7 @@ EXTERNAL_SEARCH_ID     =
 # EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTRA_SEARCH_MAPPINGS  = 
+EXTRA_SEARCH_MAPPINGS  =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
@@ -1610,7 +1610,7 @@ PAPER_TYPE             = a4
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-EXTRA_PACKAGES         = 
+EXTRA_PACKAGES         =
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
 # generated LaTeX document. The header should contain everything until the first
@@ -1626,7 +1626,7 @@ EXTRA_PACKAGES         =
 # PROJECT_NAME), or the project number (see PROJECT_NUMBER).
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_HEADER           = 
+LATEX_HEADER           =
 
 # The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
 # generated LaTeX document. The footer should contain everything after the last
@@ -1635,7 +1635,7 @@ LATEX_HEADER           =
 # Note: Only use a user-defined footer if you know what you are doing!
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_FOOTER           = 
+LATEX_FOOTER           =
 
 # The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the LATEX_OUTPUT output
@@ -1643,7 +1643,7 @@ LATEX_FOOTER           =
 # markers available.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
-LATEX_EXTRA_FILES      = 
+LATEX_EXTRA_FILES      =
 
 # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
 # prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
@@ -1743,14 +1743,14 @@ RTF_HYPERLINKS         = NO
 # default style sheet that doxygen normally uses.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_STYLESHEET_FILE    = 
+RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
 # similar to doxygen's config file. A template extensions file can be generated
 # using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
-RTF_EXTENSIONS_FILE    = 
+RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the man page output
@@ -1811,13 +1811,13 @@ XML_OUTPUT             = xml
 # validating XML parser to check the syntax of the XML files.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_SCHEMA             = 
+XML_SCHEMA             =
 
 # The XML_DTD tag can be used to specify a XML DTD, which can be used by a
 # validating XML parser to check the syntax of the XML files.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_DTD                = 
+XML_DTD                =
 
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
@@ -1894,7 +1894,7 @@ PERLMOD_PRETTY         = YES
 # overwrite each other's variables.
 # This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 
 #---------------------------------------------------------------------------
 # Configuration options related to the preprocessor
@@ -1935,7 +1935,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = 
+INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -1943,7 +1943,7 @@ INCLUDE_PATH           =
 # used.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_FILE_PATTERNS  =
 
 # The PREDEFINED tag can be used to specify one or more macro names that are
 # defined before the preprocessor is started (similar to the -D option of e.g.
@@ -1953,7 +1953,7 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = 
+PREDEFINED             =
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
@@ -1962,7 +1962,7 @@ PREDEFINED             =
 # definition found in the source code.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-EXPAND_AS_DEFINED      = 
+EXPAND_AS_DEFINED      =
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all refrences to function-like macros that are alone on a line, have an
@@ -1991,13 +1991,13 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               = 
+TAGFILES               =
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
 # external documentation" for more information about the usage of tag files.
 
-GENERATE_TAGFILE       = 
+GENERATE_TAGFILE       =
 
 # If the ALLEXTERNALS tag is set to YES all external class will be listed in the
 # class index. If set to NO only the inherited external classes will be listed.
@@ -2045,14 +2045,14 @@ CLASS_DIAGRAMS         = NO
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
-MSCGEN_PATH            = 
+MSCGEN_PATH            =
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
 # DIA_PATH tag allows you to specify the directory where the dia binary resides.
 # If left empty dia is assumed to be found in the default search path.
 
-DIA_PATH               = 
+DIA_PATH               =
 
 # If set to YES, the inheritance and collaboration graphs will hide inheritance
 # and usage relations if the target is undocumented or is not a class.
@@ -2101,7 +2101,7 @@ DOT_FONTSIZE           = 10
 # the path where dot can find it using this tag.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_FONTPATH           = 
+DOT_FONTPATH           =
 
 # If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
 # each documented class showing the direct and indirect inheritance relations.
@@ -2239,26 +2239,26 @@ INTERACTIVE_SVG        = YES
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = 
+DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
 # command).
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOTFILE_DIRS           = 
+DOTFILE_DIRS           =
 
 # The MSCFILE_DIRS tag can be used to specify one or more directories that
 # contain msc files that are included in the documentation (see the \mscfile
 # command).
 
-MSCFILE_DIRS           = 
+MSCFILE_DIRS           =
 
 # The DIAFILE_DIRS tag can be used to specify one or more directories that
 # contain dia files that are included in the documentation (see the \diafile
 # command).
 
-DIAFILE_DIRS           = 
+DIAFILE_DIRS           =
 
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
@@ -2319,4 +2319,3 @@ GENERATE_LEGEND        = YES
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES
-

src/pocketmine/Achievement.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine;
 
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 /**
@@ -116,7 +116,7 @@ abstract class Achievement{
 	public static function broadcast(Player $player, string $achievementId) : bool{
 		if(isset(Achievement::$list[$achievementId])){
 			$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"] . TextFormat::RESET]);
-			if(Server::getInstance()->getConfigBool("announce-player-achievements", true) === true){
+			if(Server::getInstance()->getConfigBool("announce-player-achievements", true)){
 				Server::getInstance()->broadcastMessage($translation);
 			}else{
 				$player->sendMessage($translation);

src/pocketmine/CrashDump.php

@@ -115,10 +115,10 @@ class CrashDump{
 	}
 
 	private function extraData(){
-		global $arguments;
+		global $argv;
 
 		if($this->server->getProperty("auto-report.send-settings", true) !== false){
-			$this->data["parameters"] = (array) $arguments;
+			$this->data["parameters"] = (array) $argv;
 			$this->data["server.properties"] = @file_get_contents($this->server->getDataPath() . "server.properties");
 			$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $this->data["server.properties"]);
 			$this->data["pocketmine.yml"] = @file_get_contents($this->server->getDataPath() . "pocketmine.yml");
@@ -148,7 +148,7 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
+			$error["trace"] = Utils::getTrace(4); //Skipping CrashDump->baseCrash, CrashDump->construct, Server->crashDump
 			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",
@@ -167,7 +167,7 @@ class CrashDump{
 				E_USER_DEPRECATED => "E_USER_DEPRECATED"
 			];
 			$error["fullFile"] = $error["file"];
-			$error["file"] = cleanPath($error["file"]);
+			$error["file"] = Utils::cleanPath($error["file"]);
 			$error["type"] = $errorConversion[$error["type"]] ?? $error["type"];
 			if(($pos = strpos($error["message"], "\n")) !== false){
 				$error["message"] = substr($error["message"], 0, $pos);
@@ -195,7 +195,7 @@ class CrashDump{
 			$file = $reflection->getProperty("file");
 			$file->setAccessible(true);
 			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
-				$filePath = \pocketmine\cleanPath($file->getValue($plugin));
+				$filePath = Utils::cleanPath($file->getValue($plugin));
 				if(strpos($error["file"], $filePath) === 0){
 					$this->data["plugin"] = $plugin->getName();
 					$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());

src/pocketmine/MemoryManager.php

@@ -24,9 +24,9 @@ declare(strict_types=1);
 namespace pocketmine;
 
 use pocketmine\event\server\LowMemoryEvent;
-use pocketmine\event\Timings;
 use pocketmine\scheduler\DumpWorkerMemoryTask;
 use pocketmine\scheduler\GarbageCollectionTask;
+use pocketmine\timings\Timings;
 use pocketmine\utils\MainLogger;
 use pocketmine\utils\Utils;
 

src/pocketmine/OfflinePlayer.php

@@ -72,7 +72,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 			return;
 		}
 
-		if($value === true){
+		if($value){
 			$this->server->addOp(strtolower($this->getName()));
 		}else{
 			$this->server->removeOp(strtolower($this->getName()));
@@ -84,7 +84,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	}
 
 	public function setBanned(bool $value){
-		if($value === true){
+		if($value){
 			$this->server->getNameBans()->addBan($this->getName(), null, null, null);
 		}else{
 			$this->server->getNameBans()->remove($this->getName());
@@ -96,7 +96,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	}
 
 	public function setWhitelisted(bool $value){
-		if($value === true){
+		if($value){
 			$this->server->addWhitelist(strtolower($this->getName()));
 		}else{
 			$this->server->removeWhitelist(strtolower($this->getName()));

src/pocketmine/PocketMine.php

@@ -71,37 +71,99 @@ namespace {
 
 namespace pocketmine {
 
-	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\ServerKiller;
 	use pocketmine\utils\Terminal;
+	use pocketmine\utils\Timezone;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\SetupWizard;
 	use raklib\RakLib;
 
 	const NAME = "PocketMine-MP";
 	const VERSION = "1.7dev";
-	const API_VERSION = "3.0.0-ALPHA11";
+	const API_VERSION = "3.0.0-ALPHA12";
 	const CODENAME = "[REDACTED]";
 
-	const MIN_PHP_VERSION = "7.2.0RC3";
+	const MIN_PHP_VERSION = "7.2.0";
+
+	function critical_error($message){
+		echo "[ERROR] $message" . PHP_EOL;
+	}
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
-	 * Most of them are hacks to fix date-related bugs, or basic functions used after this
 	 * This is the only non-class based file on this project.
 	 * Enjoy it as much as I did writing it. I don't want to do it again.
 	 */
 
 	if(version_compare(MIN_PHP_VERSION, PHP_VERSION) > 0){
-		echo "[CRITICAL] " . \pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . "." . PHP_EOL;
-		echo "[CRITICAL] Please use the installer provided on the homepage, or update to a newer PHP version." . PHP_EOL;
+		critical_error(\pocketmine\NAME . " requires PHP >= " . MIN_PHP_VERSION . ", but you have PHP " . PHP_VERSION . ".");
+		critical_error("Please use the installer provided on the homepage, or update to a newer PHP version.");
 		exit(1);
 	}
 
-	if(!extension_loaded("pthreads")){
-		echo "[CRITICAL] Unable to find the pthreads extension." . PHP_EOL;
-		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
+	if(PHP_INT_SIZE < 8){
+		critical_error("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported.");
+		critical_error("Please upgrade to a 64-bit system, or use a 64-bit PHP binary if this is a 64-bit system.");
+		exit(1);
+	}
+
+	/* Dependencies check */
+
+	$errors = 0;
+
+	if(php_sapi_name() !== "cli"){
+		critical_error("You must run " . \pocketmine\NAME . " using the CLI.");
+		++$errors;
+	}
+
+	$extensions = [
+		"bcmath" => "BC Math",
+		"curl" => "cURL",
+		"json" => "JSON",
+		"mbstring" => "Multibyte String",
+		"openssl" => "OpenSSL",
+		"phar" => "Phar",
+		"pthreads" => "pthreads",
+		"sockets" => "Sockets",
+		"yaml" => "YAML",
+		"zip" => "Zip",
+		"zlib" => "Zlib"
+	];
+
+	foreach($extensions as $ext => $name){
+		if(!extension_loaded($ext)){
+			critical_error("Unable to find the $name ($ext) extension.");
+			++$errors;
+		}
+	}
+
+	if(extension_loaded("pthreads")){
+		$pthreads_version = phpversion("pthreads");
+		if(substr_count($pthreads_version, ".") < 2){
+			$pthreads_version = "0.$pthreads_version";
+		}
+		if(version_compare($pthreads_version, "3.1.7-dev") < 0){
+			critical_error("pthreads >= 3.1.7-dev is required, while you have $pthreads_version.");
+			++$errors;
+		}
+	}
+
+	if(extension_loaded("leveldb")){
+		$leveldb_version = phpversion("leveldb");
+		if(version_compare($leveldb_version, "0.2.1") < 0){
+			critical_error("php-leveldb >= 0.2.1 is required, while you have $leveldb_version");
+			++$errors;
+		}
+	}
+
+	if(extension_loaded("pocketmine")){
+		critical_error("The native PocketMine extension is no longer supported.");
+		++$errors;
+	}
+
+	if($errors > 0){
+		critical_error("Please use the installer provided on the homepage, or recompile PHP again.");
 		exit(1);
 	}
 
@@ -117,12 +179,6 @@ namespace pocketmine {
 
 	set_error_handler('\pocketmine\error_handler');
 
-	if(!extension_loaded("phar")){
-		echo "[CRITICAL] Unable to find the Phar extension." . PHP_EOL;
-		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
-		exit(1);
-	}
-
 	if(\Phar::running(true) !== ""){
 		define('pocketmine\PATH', \Phar::running(true) . "/");
 	}else{
@@ -132,8 +188,8 @@ namespace pocketmine {
 	define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php');
 
 	function composer_error_die($message){
-		echo "[CRITICAL] $message" . PHP_EOL;
-		echo "[CRITICAL] Please install/update Composer dependencies or use provided builds." . PHP_EOL;
+		critical_error($message);
+		critical_error("Please install/update Composer dependencies or use provided builds.");
 		exit(1);
 	}
 
@@ -146,8 +202,8 @@ namespace pocketmine {
 	if(!class_exists(RakLib::class)){
 		composer_error_die("Unable to find the RakLib library.");
 	}
-	if(version_compare(RakLib::VERSION, "0.9.0") < 0){ //TODO: remove this check (it's managed by Composer now)
-		composer_error_die("RakLib version 0.9.0 is required, while you have version " . RakLib::VERSION . ".");
+	if(version_compare(RakLib::VERSION, "0.11.0") < 0){ //TODO: remove this check (it's managed by Composer now)
+		composer_error_die("RakLib version 0.11.0 is required, while you have version " . RakLib::VERSION . ".");
 	}
 	if(!class_exists(\BaseClassLoader::class)){
 		composer_error_die("Unable to find the PocketMine-SPL library.");
@@ -184,176 +240,16 @@ namespace pocketmine {
 		mkdir(\pocketmine\DATA, 0777, true);
 	}
 
-	//Logger has a dependency on timezone, so we'll set it to UTC until we can get the actual timezone.
-	date_default_timezone_set("UTC");
+	//Logger has a dependency on timezone
+	$tzError = Timezone::init();
 
 	$logger = new MainLogger(\pocketmine\DATA . "server.log");
 	$logger->registerStatic();
 
-	do{
-		$timezone = ini_get("date.timezone");
-		if($timezone !== ""){
-			/*
-			 * This is here so that people don't come to us complaining and fill up the issue tracker when they put
-			 * an incorrect timezone abbreviation in php.ini apparently.
-			 */
-			if(strpos($timezone, "/") === false){
-				$default_timezone = timezone_name_from_abbr($timezone);
-				if($default_timezone !== false){
-					ini_set("date.timezone", $default_timezone);
-					date_default_timezone_set($default_timezone);
-					break;
-				}else{
-					//Bad php.ini value, try another method to detect timezone
-					$logger->warning("Timezone \"$timezone\" could not be parsed as a valid timezone from php.ini, falling back to auto-detection");
-				}
-			}else{
-				date_default_timezone_set($timezone);
-				break;
-			}
-		}
-
-		if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){
-			//Success! Timezone has already been set and validated in the if statement.
-			//This here is just for redundancy just in case some program wants to read timezone data from the ini.
-			ini_set("date.timezone", $timezone);
-			break;
-		}
-
-		if($response = Utils::getURL("http://ip-api.com/json") //If system timezone detection fails or timezone is an invalid value.
-			and $ip_geolocation_data = json_decode($response, true)
-			and $ip_geolocation_data['status'] !== 'fail'
-			and date_default_timezone_set($ip_geolocation_data['timezone'])
-		){
-			//Again, for redundancy.
-			ini_set("date.timezone", $ip_geolocation_data['timezone']);
-			break;
-		}
-
-		ini_set("date.timezone", "UTC");
-		date_default_timezone_set("UTC");
-		$logger->warning("Timezone could not be automatically determined or was set to an invalid value. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
-	}while(false);
-
-
-	function detect_system_timezone(){
-		switch(Utils::getOS()){
-			case 'win':
-				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
-
-				/*
-				 * wmic timezone get Caption
-				 * Get the timezone offset
-				 *
-				 * Sample Output var_dump
-				 * array(3) {
-				 *	  [0] =>
-				 *	  string(7) "Caption"
-				 *	  [1] =>
-				 *	  string(20) "(UTC+09:30) Adelaide"
-				 *	  [2] =>
-				 *	  string(0) ""
-				 *	}
-				 */
-				exec("wmic timezone get Caption", $output);
-
-				$string = trim(implode("\n", $output));
-
-				//Detect the Time Zone string
-				preg_match($regex, $string, $matches);
-
-				if(!isset($matches[2])){
-					return false;
-				}
-
-				$offset = $matches[2];
-
-				if($offset == ""){
-					return "UTC";
-				}
-
-				return parse_offset($offset);
-			case 'linux':
-				// Ubuntu / Debian.
-				if(file_exists('/etc/timezone')){
-					$data = file_get_contents('/etc/timezone');
-					if($data){
-						return trim($data);
-					}
-				}
-
-				// RHEL / CentOS
-				if(file_exists('/etc/sysconfig/clock')){
-					$data = parse_ini_file('/etc/sysconfig/clock');
-					if(!empty($data['ZONE'])){
-						return trim($data['ZONE']);
-					}
-				}
-
-				//Portable method for incompatible linux distributions.
-
-				$offset = trim(exec('date +%:z'));
-
-				if($offset == "+00:00"){
-					return "UTC";
-				}
-
-				return parse_offset($offset);
-			case 'mac':
-				if(is_link('/etc/localtime')){
-					$filename = readlink('/etc/localtime');
-					if(strpos($filename, '/usr/share/zoneinfo/') === 0){
-						$timezone = substr($filename, 20);
-						return trim($timezone);
-					}
-				}
-
-				return false;
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
-	 *
-	 * @return string|bool
-	 */
-	function parse_offset($offset){
-		//Make signed offsets unsigned for date_parse
-		if(strpos($offset, '-') !== false){
-			$negative_offset = true;
-			$offset = str_replace('-', '', $offset);
-		}else{
-			if(strpos($offset, '+') !== false){
-				$negative_offset = false;
-				$offset = str_replace('+', '', $offset);
-			}else{
-				return false;
-			}
-		}
-
-		$parsed = date_parse($offset);
-		$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
-
-		//After date_parse is done, put the sign back
-		if($negative_offset == true){
-			$offset = -abs($offset);
-		}
-
-		//And then, look the offset up.
-		//timezone_name_from_abbr is not used because it returns false on some(most) offsets because it's mapping function is weird.
-		//That's been a bug in PHP since 2008!
-		foreach(timezone_abbreviations_list() as $zones){
-			foreach($zones as $timezone){
-				if($timezone['offset'] == $offset){
-					return $timezone['timezone_id'];
-				}
-			}
-		}
-
-		return false;
+	foreach($tzError as $e){
+		$logger->warning($e);
 	}
+	unset($tzError);
 
 	if(isset($opts["enable-profiler"])){
 		if(function_exists("profiler_enable")){
@@ -364,181 +260,39 @@ namespace pocketmine {
 		}
 	}
 
-	function kill($pid){
-		global $logger;
-		if($logger instanceof MainLogger){
-			$logger->syncFlushBuffer();
-		}
-		switch(Utils::getOS()){
-			case "win":
-				exec("taskkill.exe /F /PID " . ((int) $pid) . " > NUL");
-				break;
-			case "mac":
-			case "linux":
-			default:
-				if(function_exists("posix_kill")){
-					posix_kill($pid, SIGKILL);
-				}else{
-					exec("kill -9 " . ((int) $pid) . " > /dev/null 2>&1");
-				}
-		}
+	if(extension_loaded("xdebug")){
+		$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
 	}
 
-	/**
-	 * @param object $value
-	 * @param bool   $includeCurrent
-	 *
-	 * @return int
-	 */
-	function getReferenceCount($value, $includeCurrent = true){
-		ob_start();
-		debug_zval_dump($value);
-		$ret = explode("\n", ob_get_contents());
-		ob_end_clean();
-
-		if(count($ret) >= 1 and preg_match('/^.* refcount\\(([0-9]+)\\)\\{$/', trim($ret[0]), $m) > 0){
-			return ((int) $m[1]) - ($includeCurrent ? 3 : 4); //$value + zval call + extra call
-		}
-		return -1;
+	if(\Phar::running(true) === ""){
+		$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
 	}
 
-	/**
-	 * @param int        $start
-	 * @param array|null $trace
-	 *
-	 * @return array
-	 */
-	function getTrace($start = 0, $trace = null){
-		if($trace === null){
-			if(function_exists("xdebug_get_function_stack")){
-				$trace = array_reverse(xdebug_get_function_stack());
-			}else{
-				$e = new \Exception();
-				$trace = $e->getTrace();
+	$gitHash = str_repeat("00", 20);
+
+	if(\Phar::running(true) === ""){
+		if(Utils::execute("git rev-parse HEAD", $out) === 0){
+			$gitHash = trim($out);
+			if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
+				$gitHash .= "-dirty";
 			}
 		}
-
-		$messages = [];
-		$j = 0;
-		for($i = (int) $start; isset($trace[$i]); ++$i, ++$j){
-			$params = "";
-			if(isset($trace[$i]["args"]) or isset($trace[$i]["params"])){
-				if(isset($trace[$i]["args"])){
-					$args = $trace[$i]["args"];
-				}else{
-					$args = $trace[$i]["params"];
-				}
-
-				$params = implode(", ", array_map(function($value){
-					return (is_object($value) ? get_class($value) . " object" : gettype($value) . " " . (is_array($value) ? "Array()" : Utils::printable(@strval($value))));
-				}, $args));
-			}
-			$messages[] = "#$j " . (isset($trace[$i]["file"]) ? cleanPath($trace[$i]["file"]) : "") . "(" . (isset($trace[$i]["line"]) ? $trace[$i]["line"] : "") . "): " . (isset($trace[$i]["class"]) ? $trace[$i]["class"] . (($trace[$i]["type"] === "dynamic" or $trace[$i]["type"] === "->") ? "->" : "::") : "") . $trace[$i]["function"] . "(" . Utils::printable($params) . ")";
+	}else{
+		$phar = new \Phar(\Phar::running(false));
+		$meta = $phar->getMetadata();
+		if(isset($meta["git"])){
+			$gitHash = $meta["git"];
 		}
-
-		return $messages;
 	}
 
-	function cleanPath($path){
-		return str_replace(["\\", ".php", "phar://", str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH)], ["/", "", "", "", ""], $path);
-	}
+	define('pocketmine\GIT_COMMIT', $gitHash);
+
+
+	@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
+	@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
 
 	$exitCode = 0;
-
 	do{
-		$errors = 0;
-
-		if(PHP_INT_SIZE < 8){
-			$logger->critical("Running " . \pocketmine\NAME . " with 32-bit systems/PHP is no longer supported. Please upgrade to a 64-bit system or use a 64-bit PHP binary.");
-			$exitCode = 1;
-			break;
-		}
-
-		if(php_sapi_name() !== "cli"){
-			$logger->critical("You must run " . \pocketmine\NAME . " using the CLI.");
-			++$errors;
-		}
-
-		$pthreads_version = phpversion("pthreads");
-		if(substr_count($pthreads_version, ".") < 2){
-			$pthreads_version = "0.$pthreads_version";
-		}
-		if(version_compare($pthreads_version, "3.1.7-dev") < 0){
-			$logger->critical("pthreads >= 3.1.7-dev is required, while you have $pthreads_version.");
-			++$errors;
-		}
-
-		if(extension_loaded("leveldb")){
-			$leveldb_version = phpversion("leveldb");
-			if(version_compare($leveldb_version, "0.2.1") < 0){
-				$logger->critical("php-leveldb >= 0.2.1 is required, while you have $leveldb_version");
-				++$errors;
-			}
-		}
-
-		if(extension_loaded("pocketmine")){
-			if(version_compare(phpversion("pocketmine"), "0.0.1") < 0){
-				$logger->critical("You have the native PocketMine extension, but your version is lower than 0.0.1.");
-				++$errors;
-			}elseif(version_compare(phpversion("pocketmine"), "0.0.4") > 0){
-				$logger->critical("You have the native PocketMine extension, but your version is higher than 0.0.4.");
-				++$errors;
-			}
-		}
-
-		if(extension_loaded("xdebug")){
-			$logger->warning(PHP_EOL . PHP_EOL . PHP_EOL . "\tYou are running " . \pocketmine\NAME . " with xdebug enabled. This has a major impact on performance." . PHP_EOL . PHP_EOL);
-		}
-
-		$extensions = [
-			"bcmath" => "BC Math",
-			"curl" => "cURL",
-			"json" => "JSON",
-			"mbstring" => "Multibyte String",
-			"openssl" => "OpenSSL",
-			"sockets" => "Sockets",
-			"yaml" => "YAML",
-			"zip" => "Zip",
-			"zlib" => "Zlib"
-		];
-
-		foreach($extensions as $ext => $name){
-			if(!extension_loaded($ext)){
-				$logger->critical("Unable to find the $name ($ext) extension.");
-				++$errors;
-			}
-		}
-
-		if($errors > 0){
-			$logger->critical("Please use the installer provided on the homepage, or recompile PHP again.");
-			$exitCode = 1;
-			break;
-		}
-
-		$gitHash = str_repeat("00", 20);
-
-		if(\Phar::running(true) === ""){
-			if(Utils::execute("git rev-parse HEAD", $out) === 0){
-				$gitHash = trim($out);
-				if(Utils::execute("git diff --quiet") === 1 or Utils::execute("git diff --cached --quiet") === 1){ //Locally-modified
-					$gitHash .= "-dirty";
-				}
-			}
-		}else{
-			$phar = new \Phar(\Phar::running(false));
-			$meta = $phar->getMetadata();
-			if(isset($meta["git"])){
-				$gitHash = $meta["git"];
-			}
-		}
-
-		define('pocketmine\GIT_COMMIT', $gitHash);
-
-
-		@define("INT32_MASK", is_int(0xffffffff) ? 0xffffffff : -1);
-		@ini_set("opcache.mmap_base", bin2hex(random_bytes(8))); //Fix OPCache address errors
-
-
 		if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
 			$installer = new SetupWizard();
 			if(!$installer->run()){
@@ -547,25 +301,20 @@ namespace pocketmine {
 			}
 		}
 
-
-		if(\Phar::running(true) === ""){
-			$logger->warning("Non-packaged " . \pocketmine\NAME . " installation detected. Consider using a phar in production for better performance.");
-		}
-
 		ThreadManager::init();
 		new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
 
 		$logger->info("Stopping other threads");
 
 		$killer = new ServerKiller(8);
-		$killer->start();
+		$killer->start(PTHREADS_INHERIT_NONE);
 		usleep(10000); //Fixes ServerKiller not being able to start on single-core machines
 
 		if(ThreadManager::getInstance()->stopAll() > 0){
 			if(\pocketmine\DEBUG > 1){
 				echo "Some threads could not be stopped, performing a force-kill" . PHP_EOL . PHP_EOL;
 			}
-			kill(getmypid());
+			Utils::kill(getmypid());
 		}
 	}while(false);
 

src/pocketmine/Server.php

@@ -33,8 +33,6 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\ConsoleCommandSender;
 use pocketmine\command\PluginIdentifiableCommand;
 use pocketmine\command\SimpleCommandMap;
-use pocketmine\entity\Attribute;
-use pocketmine\entity\Effect;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Skin;
 use pocketmine\event\HandlerList;
@@ -43,25 +41,16 @@ use pocketmine\event\level\LevelLoadEvent;
 use pocketmine\event\player\PlayerDataSaveEvent;
 use pocketmine\event\server\QueryRegenerateEvent;
 use pocketmine\event\server\ServerCommandEvent;
-use pocketmine\event\TextContainer;
-use pocketmine\event\Timings;
-use pocketmine\event\TimingsHandler;
 use pocketmine\inventory\CraftingManager;
-use pocketmine\inventory\Recipe;
 use pocketmine\item\enchantment\Enchantment;
+use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\lang\BaseLang;
-use pocketmine\level\format\io\leveldb\LevelDB;
+use pocketmine\lang\TextContainer;
 use pocketmine\level\format\io\LevelProvider;
 use pocketmine\level\format\io\LevelProviderManager;
-use pocketmine\level\format\io\region\Anvil;
-use pocketmine\level\format\io\region\McRegion;
-use pocketmine\level\format\io\region\PMAnvil;
 use pocketmine\level\generator\biome\Biome;
-use pocketmine\level\generator\Flat;
 use pocketmine\level\generator\Generator;
-use pocketmine\level\generator\hell\Nether;
-use pocketmine\level\generator\normal\Normal;
 use pocketmine\level\Level;
 use pocketmine\level\LevelException;
 use pocketmine\metadata\EntityMetadataStore;
@@ -78,6 +67,7 @@ use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\LongTag;
 use pocketmine\nbt\tag\ShortTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\network\AdvancedSourceInterface;
 use pocketmine\network\CompressBatchedTask;
 use pocketmine\network\mcpe\protocol\BatchPacket;
 use pocketmine\network\mcpe\protocol\DataPacket;
@@ -101,6 +91,8 @@ use pocketmine\scheduler\FileWriteTask;
 use pocketmine\scheduler\SendUsageTask;
 use pocketmine\scheduler\ServerScheduler;
 use pocketmine\tile\Tile;
+use pocketmine\timings\Timings;
+use pocketmine\timings\TimingsHandler;
 use pocketmine\updater\AutoUpdater;
 use pocketmine\utils\Binary;
 use pocketmine\utils\Config;
@@ -263,9 +255,6 @@ class Server{
 	/** @var Player[] */
 	private $playerList = [];
 
-	/** @var string[] */
-	private $identifiers = [];
-
 	/** @var Level[] */
 	private $levels = [];
 
@@ -283,7 +272,7 @@ class Server{
 	 * @return bool
 	 */
 	public function isRunning() : bool{
-		return $this->isRunning === true;
+		return $this->isRunning;
 	}
 
 	/**
@@ -521,16 +510,6 @@ class Server{
 		return -1;
 	}
 
-	/**
-	 * @deprecated Moved to {@link Level#getDifficultyFromString}
-	 *
-	 * @param string $str
-	 * @return int
-	 */
-	public static function getDifficultyFromString(string $str) : int{
-		return Level::getDifficultyFromString($str);
-	}
-
 	/**
 	 * Returns Server global difficulty. Note that this may be overridden in individual Levels.
 	 * @return int
@@ -640,7 +619,7 @@ class Server{
 	/**
 	 * @return ResourcePackManager
 	 */
-	public function getResourceManager() : ResourcePackManager{
+	public function getResourcePackManager() : ResourcePackManager{
 		return $this->resourceManager;
 	}
 
@@ -715,10 +694,6 @@ class Server{
 		return $this->playerList;
 	}
 
-	public function addRecipe(Recipe $recipe){
-		$this->craftingManager->registerRecipe($recipe);
-	}
-
 	public function shouldSavePlayerData() : bool{
 		return (bool) $this->getProperty("player.save-player-data", true);
 	}
@@ -751,9 +726,12 @@ class Server{
 			if(file_exists($path . "$name.dat")){
 				try{
 					$nbt = new BigEndianNBTStream();
-					$nbt->readCompressed(file_get_contents($path . "$name.dat"));
+					$compound = $nbt->readCompressed(file_get_contents($path . "$name.dat"));
+					if(!($compound instanceof CompoundTag)){
+						throw new \RuntimeException("Invalid data found in \"$name.dat\", expected " . CompoundTag::class . ", got " . (is_object($compound) ? get_class($compound) : gettype($compound)));
+					}
 
-					return $nbt->getData();
+					return $compound;
 				}catch(\Throwable $e){ //zlib decode error / corrupt data
 					rename($path . "$name.dat", $path . "$name.dat.bak");
 					$this->logger->notice($this->getLanguage()->translateString("pocketmine.data.playerCorrupted", [$name]));
@@ -775,9 +753,9 @@ class Server{
 			], NBT::TAG_Double),
 			new StringTag("Level", $this->getDefaultLevel()->getFolderName()),
 			//new StringTag("SpawnLevel", $this->getDefaultLevel()->getFolderName()),
-			//new IntTag("SpawnX", (int) $spawn->x),
-			//new IntTag("SpawnY", (int) $spawn->y),
-			//new IntTag("SpawnZ", (int) $spawn->z),
+			//new IntTag("SpawnX", $spawn->getFloorX()),
+			//new IntTag("SpawnY", $spawn->getFloorY()),
+			//new IntTag("SpawnZ", $spawn->getFloorZ()),
 			//new ByteTag("SpawnForced", 1), //TODO
 			new ListTag("Inventory", [], NBT::TAG_Compound),
 			new ListTag("EnderChestInventory", [], NBT::TAG_Compound),
@@ -818,12 +796,10 @@ class Server{
 		if(!$ev->isCancelled()){
 			$nbt = new BigEndianNBTStream();
 			try{
-				$nbt->setData($ev->getSaveData());
-
 				if($async){
-					$this->getScheduler()->scheduleAsyncTask(new FileWriteTask($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed()));
+					$this->getScheduler()->scheduleAsyncTask(new FileWriteTask($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData())));
 				}else{
-					file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed());
+					file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData()));
 				}
 			}catch(\Throwable $e){
 				$this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()]));
@@ -894,23 +870,25 @@ class Server{
 	}
 
 	/**
-	 * @param Player $player
+	 * Returns the player online with the specified raw UUID, or null if not found
+	 *
+	 * @param string $rawUUID
+	 *
+	 * @return null|Player
 	 */
-	public function removePlayer(Player $player){
-		if(isset($this->identifiers[$hash = spl_object_hash($player)])){
-			$identifier = $this->identifiers[$hash];
-			unset($this->players[$identifier]);
-			unset($this->identifiers[$hash]);
-			return;
-		}
+	public function getPlayerByRawUUID(string $rawUUID) : ?Player{
+		return $this->playerList[$rawUUID] ?? null;
+	}
 
-		foreach($this->players as $identifier => $p){
-			if($player === $p){
-				unset($this->players[$identifier]);
-				unset($this->identifiers[spl_object_hash($player)]);
-				break;
-			}
-		}
+	/**
+	 * Returns the player online with a UUID equivalent to the specified UUID object, or null if not found
+	 *
+	 * @param UUID $uuid
+	 *
+	 * @return null|Player
+	 */
+	public function getPlayerByUUID(UUID $uuid) : ?Player{
+		return $this->getPlayerByRawUUID($uuid->toBinary());
 	}
 
 	/**
@@ -1025,7 +1003,7 @@ class Server{
 		$provider = LevelProviderManager::getProvider($path);
 
 		if($provider === null){
-			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Unknown provider"]));
+			$this->logger->error($this->getLanguage()->translateString("pocketmine.level.loadError", [$name, "Cannot identify format of world"]));
 
 			return false;
 		}
@@ -1051,11 +1029,11 @@ class Server{
 	}
 
 	/**
-	 * Generates a new level if it does not exists
+	 * Generates a new level if it does not exist
 	 *
 	 * @param string      $name
 	 * @param int|null    $seed
-	 * @param string|null $generator Class name that extends pocketmine\level\generator\Noise
+	 * @param string|null $generator Class name that extends pocketmine\level\generator\Generator
 	 * @param array       $options
 	 *
 	 * @return bool
@@ -1103,8 +1081,8 @@ class Server{
 		$this->getLogger()->notice($this->getLanguage()->translateString("pocketmine.level.backgroundGeneration", [$name]));
 
 		$spawnLocation = $level->getSpawnLocation();
-		$centerX = $spawnLocation->x >> 4;
-		$centerZ = $spawnLocation->z >> 4;
+		$centerX = $spawnLocation->getFloorX() >> 4;
+		$centerZ = $spawnLocation->getFloorZ() >> 4;
 
 		$order = [];
 
@@ -1139,10 +1117,9 @@ class Server{
 		}
 		$path = $this->getDataPath() . "worlds/" . $name . "/";
 		if(!($this->getLevelByName($name) instanceof Level)){
-
-			if(LevelProviderManager::getProvider($path) === null){
-				return false;
-			}
+			return is_dir($path) and !empty(array_filter(scandir($path, SCANDIR_SORT_NONE), function($v){
+				return $v !== ".." and $v !== ".";
+			}));
 		}
 
 		return true;
@@ -1266,24 +1243,12 @@ class Server{
 		return false;
 	}
 
-	/**
-	 * @deprecated
-	 *
-	 * @param string $variable
-	 * @param bool   $defaultValue
-	 *
-	 * @return bool
-	 */
-	public function getConfigBoolean(string $variable, bool $defaultValue = false) : bool{
-		return $this->getConfigBool($variable, $defaultValue);
-	}
-
 	/**
 	 * @param string $variable
 	 * @param bool   $value
 	 */
 	public function setConfigBool(string $variable, bool $value){
-		$this->properties->set($variable, $value == true ? "1" : "0");
+		$this->properties->set($variable, $value ? "1" : "0");
 	}
 
 	/**
@@ -1555,7 +1520,7 @@ class Server{
 
 			$this->scheduler = new ServerScheduler();
 
-			if($this->getConfigBool("enable-rcon", false) === true){
+			if($this->getConfigBool("enable-rcon", false)){
 				try{
 					$this->rcon = new RCON(
 						$this,
@@ -1591,15 +1556,15 @@ class Server{
 
 			$this->onlineMode = $this->getConfigBool("xbox-auth", true);
 			if($this->onlineMode){
-				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.auth", ["enabled", "will"]));
-				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.authProperty", ["disable", "false"]));
+				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.auth.enabled"));
+				$this->logger->notice($this->getLanguage()->translateString("pocketmine.server.authProperty.enabled"));
 			}else{
-				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.auth", ["disabled", "will not"]));
+				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.auth.disabled"));
 				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authWarning"));
-				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authProperty", ["enable", "true"]));
+				$this->logger->warning($this->getLanguage()->translateString("pocketmine.server.authProperty.disabled"));
 			}
 
-			if($this->getConfigBool("hardcore", false) === true and $this->getDifficulty() < Level::DIFFICULTY_HARD){
+			if($this->getConfigBool("hardcore", false) and $this->getDifficulty() < Level::DIFFICULTY_HARD){
 				$this->setConfigInt("difficulty", Level::DIFFICULTY_HARD);
 			}
 
@@ -1628,6 +1593,7 @@ class Server{
 
 
 			Timings::init();
+			TimingsHandler::setEnabled((bool) $this->getProperty("settings.enable-profiling", false));
 
 			$this->consoleSender = new ConsoleCommandSender();
 			$this->commandMap = new SimpleCommandMap($this);
@@ -1637,16 +1603,15 @@ class Server{
 			BlockFactory::init();
 			Enchantment::init();
 			ItemFactory::init();
+			Item::initCreativeItems();
 			Biome::init();
-			Effect::init();
-			Attribute::init();
+
 			$this->craftingManager = new CraftingManager();
 
 			$this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR);
 
 			$this->pluginManager = new PluginManager($this, $this->commandMap);
 			$this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender);
-			$this->pluginManager->setUseTimings($this->getProperty("settings.enable-profiling", false));
 			$this->profilingTickRate = (float) $this->getProperty("settings.profile-report-trigger", 20);
 			$this->pluginManager->registerInterface(PharPluginLoader::class);
 			$this->pluginManager->registerInterface(ScriptPluginLoader::class);
@@ -1663,26 +1628,18 @@ class Server{
 
 			$this->network->registerInterface(new RakLibInterface($this));
 
-
-			LevelProviderManager::addProvider(Anvil::class);
-			LevelProviderManager::addProvider(McRegion::class);
-			LevelProviderManager::addProvider(PMAnvil::class);
-			LevelProviderManager::addProvider(LevelDB::class);
+			LevelProviderManager::init();
 			if(extension_loaded("leveldb")){
 				$this->logger->debug($this->getLanguage()->translateString("pocketmine.debug.enable"));
 			}
 
-			Generator::addGenerator(Flat::class, "flat");
-			Generator::addGenerator(Normal::class, "normal");
-			Generator::addGenerator(Normal::class, "default");
-			Generator::addGenerator(Nether::class, "hell");
-			Generator::addGenerator(Nether::class, "nether");
+			Generator::registerDefaultGenerators();
 
 			foreach((array) $this->getProperty("worlds", []) as $name => $options){
 				if(!is_array($options)){
 					continue;
 				}
-				if($this->loadLevel($name) === false){
+				if(!$this->loadLevel($name)){
 					$seed = $options["seed"] ?? time();
 					if(is_string($seed) and !is_numeric($seed)){
 						$seed = Utils::javaStringHash($seed);
@@ -1711,7 +1668,7 @@ class Server{
 					$default = "world";
 					$this->setConfigString("level-name", "world");
 				}
-				if($this->loadLevel($default) === false){
+				if(!$this->loadLevel($default)){
 					$seed = getopt("", ["level-seed::"])["level-seed"] ?? $this->properties->get("level-seed", time());
 					if(!is_numeric($seed) or bccomp($seed, "9223372036854775807") > 0){
 						$seed = Utils::javaStringHash($seed);
@@ -1891,16 +1848,14 @@ class Server{
 	 * @param bool         $immediate
 	 */
 	public function batchPackets(array $players, array $packets, bool $forceSync = false, bool $immediate = false){
+		if(empty($packets)){
+			throw new \InvalidArgumentException("Cannot send empty batch");
+		}
 		Timings::$playerNetworkTimer->startTiming();
 
-		$targets = [];
-		foreach($players as $p){
-			if($p->isConnected()){
-				$targets[] = $this->identifiers[spl_object_hash($p)];
-			}
-		}
+		$targets = array_filter($players, function(Player $player) : bool{ return $player->isConnected(); });
 
-		if(count($targets) > 0){
+		if(!empty($targets)){
 			$pk = new BatchPacket();
 
 			foreach($packets as $p){
@@ -1925,17 +1880,19 @@ class Server{
 		Timings::$playerNetworkTimer->stopTiming();
 	}
 
-	public function broadcastPacketsCallback(BatchPacket $pk, array $identifiers, bool $immediate = false){
+	/**
+	 * @param BatchPacket $pk
+	 * @param Player[]    $players
+	 * @param bool        $immediate
+	 */
+	public function broadcastPacketsCallback(BatchPacket $pk, array $players, bool $immediate = false){
 		if(!$pk->isEncoded){
 			$pk->encode();
 		}
 
-		foreach($identifiers as $i){
-			if(isset($this->players[$i])){
-				$this->players[$i]->sendDataPacket($pk, false, $immediate);
-			}
+		foreach($players as $i){
+			$i->sendDataPacket($pk, false, $immediate);
 		}
-
 	}
 
 
@@ -2011,7 +1968,7 @@ class Server{
 		$this->properties->reload();
 		$this->maxPlayers = $this->getConfigInt("max-players", 20);
 
-		if($this->getConfigBool("hardcore", false) === true and $this->getDifficulty() < Level::DIFFICULTY_HARD){
+		if($this->getConfigBool("hardcore", false) and $this->getDifficulty() < Level::DIFFICULTY_HARD){
 			$this->setConfigInt("difficulty", Level::DIFFICULTY_HARD);
 		}
 
@@ -2056,7 +2013,7 @@ class Server{
 				$this->rcon->stop();
 			}
 
-			if($this->getProperty("network.upnp-forwarding", false) === true){
+			if($this->getProperty("network.upnp-forwarding", false)){
 				$this->logger->info("[UPnP] Removing port forward...");
 				UPnP::RemovePortForward($this->getPort());
 			}
@@ -2107,7 +2064,7 @@ class Server{
 		}catch(\Throwable $e){
 			$this->logger->logException($e);
 			$this->logger->emergency("Crashed while crashing, killing process");
-			@kill(getmypid());
+			@Utils::kill(getmypid());
 		}
 
 	}
@@ -2123,7 +2080,7 @@ class Server{
 	 * Starts the PocketMine-MP server and starts processing ticks and packets
 	 */
 	private function start(){
-		if($this->getConfigBool("enable-query", true) === true){
+		if($this->getConfigBool("enable-query", true)){
 			$this->queryHandler = new QueryHandler();
 		}
 
@@ -2139,7 +2096,11 @@ class Server{
 
 		if($this->getProperty("network.upnp-forwarding", false)){
 			$this->logger->info("[UPnP] Trying to port forward...");
-			UPnP::PortForward($this->getPort());
+			try{
+				UPnP::PortForward($this->getPort());
+			}catch(\Throwable $e){
+				$this->logger->alert("UPnP portforward failed: " . $e->getMessage());
+			}
 		}
 
 		$this->tickCounter = 0;
@@ -2182,24 +2143,21 @@ class Server{
 
 		$errstr = $e->getMessage();
 		$errfile = $e->getFile();
-		$errno = $e->getCode();
 		$errline = $e->getLine();
 
-		$type = ($errno === E_ERROR or $errno === E_USER_ERROR) ? \LogLevel::ERROR : (($errno === E_USER_WARNING or $errno === E_WARNING) ? \LogLevel::WARNING : \LogLevel::NOTICE);
-
 		$errstr = preg_replace('/\s+/', ' ', trim($errstr));
 
-		$errfile = cleanPath($errfile);
+		$errfile = Utils::cleanPath($errfile);
 
 		$this->logger->logException($e, $trace);
 
 		$lastError = [
-			"type" => $type,
+			"type" => \get_class($e),
 			"message" => $errstr,
 			"fullFile" => $e->getFile(),
 			"file" => $errfile,
 			"line" => $errline,
-			"trace" => getTrace(0, $trace)
+			"trace" => Utils::getTrace(0, $trace)
 		];
 
 		global $lastExceptionError, $lastError;
@@ -2208,7 +2166,7 @@ class Server{
 	}
 
 	public function crashDump(){
-		if($this->isRunning === false){
+		if(!$this->isRunning){
 			return;
 		}
 		if($this->sendUsageTicker > 0){
@@ -2218,8 +2176,8 @@ class Server{
 
 		ini_set("error_reporting", '0');
 		ini_set("memory_limit", '-1'); //Fix error dump not dumped on memory problems
-		$this->logger->emergency($this->getLanguage()->translateString("pocketmine.crash.create"));
 		try{
+			$this->logger->emergency($this->getLanguage()->translateString("pocketmine.crash.create"));
 			$dump = new CrashDump($this);
 
 			$this->logger->emergency($this->getLanguage()->translateString("pocketmine.crash.submit", [$dump->getPath()]));
@@ -2261,7 +2219,9 @@ class Server{
 			}
 		}catch(\Throwable $e){
 			$this->logger->logException($e);
-			$this->logger->critical($this->getLanguage()->translateString("pocketmine.crash.error", [$e->getMessage()]));
+			try{
+				$this->logger->critical($this->getLanguage()->translateString("pocketmine.crash.error", [$e->getMessage()]));
+			}catch(\Throwable $e){}
 		}
 
 		//$this->checkMemory();
@@ -2269,7 +2229,7 @@ class Server{
 
 		$this->forceShutdown();
 		$this->isRunning = false;
-		@kill(getmypid());
+		@Utils::kill(getmypid());
 		exit(1);
 	}
 
@@ -2300,22 +2260,23 @@ class Server{
 		$this->loggedInPlayers[$player->getRawUniqueId()] = $player;
 	}
 
-	public function onPlayerCompleteLoginSequence(Player $player){
-		$this->sendFullPlayerListData($player);
-		$player->dataPacket($this->craftingManager->getCraftingDataPacket());
-	}
-
 	public function onPlayerLogout(Player $player){
 		unset($this->loggedInPlayers[$player->getRawUniqueId()]);
 	}
 
-	public function addPlayer($identifier, Player $player){
-		$this->players[$identifier] = $player;
-		$this->identifiers[spl_object_hash($player)] = $identifier;
+	public function addPlayer(Player $player){
+		$this->players[spl_object_hash($player)] = $player;
+	}
+
+	/**
+	 * @param Player $player
+	 */
+	public function removePlayer(Player $player){
+		unset($this->players[spl_object_hash($player)]);
 	}
 
 	public function addOnlinePlayer(Player $player){
-		$this->updatePlayerListData($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->getSkin());
+		$this->updatePlayerListData($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->getSkin(), $player->getXuid());
 
 		$this->playerList[$player->getRawUniqueId()] = $player;
 	}
@@ -2333,13 +2294,15 @@ class Server{
 	 * @param int           $entityId
 	 * @param string        $name
 	 * @param Skin          $skin
+	 * @param string        $xboxUserId
 	 * @param Player[]|null $players
 	 */
-	public function updatePlayerListData(UUID $uuid, int $entityId, string $name, Skin $skin, array $players = null){
+	public function updatePlayerListData(UUID $uuid, int $entityId, string $name, Skin $skin, string $xboxUserId = "", array $players = null){
 		$pk = new PlayerListPacket();
 		$pk->type = PlayerListPacket::TYPE_ADD;
 
-		$pk->entries[] = PlayerListEntry::createAdditionEntry($uuid, $entityId, $name, $skin);
+		$pk->entries[] = PlayerListEntry::createAdditionEntry($uuid, $entityId, $name, "", 0, $skin, $xboxUserId);
+
 		$this->broadcastPacket($players ?? $this->playerList, $pk);
 	}
 
@@ -2361,7 +2324,7 @@ class Server{
 		$pk = new PlayerListPacket();
 		$pk->type = PlayerListPacket::TYPE_ADD;
 		foreach($this->playerList as $player){
-			$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->getSkin());
+			$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), "", 0, $player->getSkin(), $player->getXuid());
 		}
 
 		$p->dataPacket($pk);
@@ -2490,16 +2453,17 @@ class Server{
 	}
 
 	/**
-	 * @param string $address
-	 * @param int    $port
-	 * @param string $payload
+	 * @param AdvancedSourceInterface $interface
+	 * @param string                  $address
+	 * @param int                     $port
+	 * @param string                  $payload
 	 *
 	 * TODO: move this to Network
 	 */
-	public function handlePacket(string $address, int $port, string $payload){
+	public function handlePacket(AdvancedSourceInterface $interface, string $address, int $port, string $payload){
 		try{
 			if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){
-				$this->queryHandler->handle($address, $port, $payload);
+				$this->queryHandler->handle($interface, $address, $port, $payload);
 			}
 		}catch(\Throwable $e){
 			if(\pocketmine\DEBUG > 1){

src/pocketmine/block/Anvil.php

@@ -112,7 +112,7 @@ class Anvil extends Fallable{
 
 	public function getDropsForCompatibleTool(Item $item) : array{
 		return [
-			ItemFactory::get($this->getItemId(), $this->getDamage() & 0x0c)
+			ItemFactory::get($this->getItemId(), $this->getDamage() >> 2)
 		];
 	}
 }

src/pocketmine/block/Bed.php

@@ -23,9 +23,9 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\event\TranslationContainer;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -176,7 +176,7 @@ class Bed extends Transparent{
 		if(!$down->isTransparent()){
 			$meta = (($player instanceof Player ? $player->getDirection() : 0) - 1) & 0x03;
 			$next = $this->getSide(self::getOtherHalfSide($meta));
-			if($next->canBeReplaced() === true and !$next->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			if($next->canBeReplaced() and !$next->getSide(Vector3::SIDE_DOWN)->isTransparent()){
 				$this->getLevel()->setBlock($blockReplace, BlockFactory::get($this->id, $meta), true, true);
 				$this->getLevel()->setBlock($next, BlockFactory::get($this->id, $meta | self::BITFLAG_HEAD), true, true);
 

src/pocketmine/block/Block.php

@@ -30,7 +30,6 @@ use pocketmine\entity\Entity;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\level\Position;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\RayTraceResult;
@@ -278,6 +277,12 @@ class Block extends Position implements BlockIds, Metadatable{
 		return $base;
 	}
 
+	/**
+	 * Called when this block or a block immediately adjacent to it changes state.
+	 */
+	public function onNearbyBlockChange() : void{
+
+	}
 
 	/**
 	 * Returns whether random block updates will be done on this block.
@@ -289,14 +294,18 @@ class Block extends Position implements BlockIds, Metadatable{
 	}
 
 	/**
-	 * Fires a block update on the Block
-	 *
-	 * @param int $type
-	 *
-	 * @return bool|int
+	 * Called when this block is randomly updated due to chunk ticking.
+	 * WARNING: This will not be called if ticksRandomly() does not return true!
 	 */
-	public function onUpdate(int $type){
-		return false;
+	public function onRandomTick() : void{
+
+	}
+
+	/**
+	 * Called when this block is updated by the delayed blockupdate scheduler in the level.
+	 */
+	public function onScheduledUpdate() : void{
+
 	}
 
 	/**
@@ -319,14 +328,6 @@ class Block extends Position implements BlockIds, Metadatable{
 		return 10;
 	}
 
-	/**
-	 * @deprecated
-	 * @return float
-	 */
-	public function getResistance() : float{
-		return $this->getBlastResistance();
-	}
-
 	/**
 	 * Returns the block's resistance to explosions. Usually 5x hardness.
 	 * @return float
@@ -496,6 +497,50 @@ class Block extends Position implements BlockIds, Metadatable{
 		return 0;
 	}
 
+	/**
+	 * Returns the chance that the block will catch fire from nearby fire sources. Higher values lead to faster catching
+	 * fire.
+	 *
+	 * @return int
+	 */
+	public function getFlameEncouragement() : int{
+		return 0;
+	}
+
+	/**
+	 * Returns the base flammability of this block. Higher values lead to the block burning away more quickly.
+	 *
+	 * @return int
+	 */
+	public function getFlammability() : int{
+		return 0;
+	}
+
+	/**
+	 * Returns whether fire lit on this block will burn indefinitely.
+	 *
+	 * @return bool
+	 */
+	public function burnsForever() : bool{
+		return false;
+	}
+
+	/**
+	 * Returns whether this block can catch fire.
+	 *
+	 * @return bool
+	 */
+	public function isFlammable() : bool{
+		return $this->getFlammability() > 0;
+	}
+
+	/**
+	 * Called when this block is burned away by being on fire.
+	 */
+	public function onIncinerate() : void{
+
+	}
+
 	/**
 	 * Returns the Block on the side $side, works like Vector3::getSide()
 	 *
@@ -504,7 +549,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 *
 	 * @return Block
 	 */
-	public function getSide($side, $step = 1){
+	public function getSide(int $side, int $step = 1){
 		if($this->isValid()){
 			return $this->getLevel()->getBlock(Vector3::getSide($side, $step));
 		}
@@ -566,9 +611,7 @@ class Block extends Position implements BlockIds, Metadatable{
 	 * @return bool
 	 */
 	public function collidesWithBB(AxisAlignedBB $bb) : bool{
-		$bbs = $this->getCollisionBoxes();
-
-		foreach($bbs as $bb2){
+		foreach($this->getCollisionBoxes() as $bb2){
 			if($bb->intersectsWith($bb2)){
 				return true;
 			}
@@ -673,30 +716,30 @@ class Block extends Position implements BlockIds, Metadatable{
 	}
 
 	public function setMetadata(string $metadataKey, MetadataValue $newMetadataValue){
-		if($this->getLevel() instanceof Level){
-			$this->getLevel()->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
+		if($this->isValid()){
+			$this->level->getBlockMetadata()->setMetadata($this, $metadataKey, $newMetadataValue);
 		}
 	}
 
 	public function getMetadata(string $metadataKey){
-		if($this->getLevel() instanceof Level){
-			return $this->getLevel()->getBlockMetadata()->getMetadata($this, $metadataKey);
+		if($this->isValid()){
+			return $this->level->getBlockMetadata()->getMetadata($this, $metadataKey);
 		}
 
 		return null;
 	}
 
 	public function hasMetadata(string $metadataKey) : bool{
-		if($this->getLevel() instanceof Level){
-			return $this->getLevel()->getBlockMetadata()->hasMetadata($this, $metadataKey);
+		if($this->isValid()){
+			return $this->level->getBlockMetadata()->hasMetadata($this, $metadataKey);
 		}
 
 		return false;
 	}
 
 	public function removeMetadata(string $metadataKey, Plugin $owningPlugin){
-		if($this->getLevel() instanceof Level){
-			$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
+		if($this->isValid()){
+			$this->level->getBlockMetadata()->removeMetadata($this, $metadataKey, $owningPlugin);
 		}
 	}
 }

src/pocketmine/block/BlockFactory.php

@@ -25,6 +25,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Position;
+use pocketmine\utils\MainLogger;
 
 /**
  * Manages block registration and instance creation
@@ -50,282 +51,293 @@ class BlockFactory{
 	/** @var \SplFixedArray<float> */
 	public static $blastResistance = null;
 
+	/** @var int[] */
+	public static $staticRuntimeIdMap = [];
+
+	/** @var int[] */
+	public static $legacyIdMap = [];
+
+	/** @var int */
+	private static $lastRuntimeId = 0;
+
 	/**
 	 * Initializes the block factory. By default this is called only once on server start, however you may wish to use
 	 * this if you need to reset the block factory back to its original defaults for whatever reason.
-	 *
-	 * @param bool $force
 	 */
-	public static function init(bool $force = false) : void{
-		if(self::$list === null or $force){
-			self::$list = new \SplFixedArray(256);
-			self::$fullList = new \SplFixedArray(4096);
+	public static function init() : void{
+		self::$list = new \SplFixedArray(256);
+		self::$fullList = new \SplFixedArray(4096);
 
-			self::$light = new \SplFixedArray(256);
-			self::$lightFilter = new \SplFixedArray(256);
-			self::$solid = new \SplFixedArray(256);
-			self::$hardness = new \SplFixedArray(256);
-			self::$transparent = new \SplFixedArray(256);
-			self::$diffusesSkyLight = new \SplFixedArray(256);
-			self::$blastResistance = new \SplFixedArray(256);
+		self::$light = new \SplFixedArray(256);
+		self::$lightFilter = new \SplFixedArray(256);
+		self::$solid = new \SplFixedArray(256);
+		self::$hardness = new \SplFixedArray(256);
+		self::$transparent = new \SplFixedArray(256);
+		self::$diffusesSkyLight = new \SplFixedArray(256);
+		self::$blastResistance = new \SplFixedArray(256);
 
-			self::registerBlock(new Air());
-			self::registerBlock(new Stone());
-			self::registerBlock(new Grass());
-			self::registerBlock(new Dirt());
-			self::registerBlock(new Cobblestone());
-			self::registerBlock(new Planks());
-			self::registerBlock(new Sapling());
-			self::registerBlock(new Bedrock());
-			self::registerBlock(new Water());
-			self::registerBlock(new StillWater());
-			self::registerBlock(new Lava());
-			self::registerBlock(new StillLava());
-			self::registerBlock(new Sand());
-			self::registerBlock(new Gravel());
-			self::registerBlock(new GoldOre());
-			self::registerBlock(new IronOre());
-			self::registerBlock(new CoalOre());
-			self::registerBlock(new Wood());
-			self::registerBlock(new Leaves());
-			self::registerBlock(new Sponge());
-			self::registerBlock(new Glass());
-			self::registerBlock(new LapisOre());
-			self::registerBlock(new Lapis());
-			//TODO: DISPENSER
-			self::registerBlock(new Sandstone());
-			self::registerBlock(new NoteBlock());
-			self::registerBlock(new Bed());
-			self::registerBlock(new PoweredRail());
-			self::registerBlock(new DetectorRail());
-			//TODO: STICKY_PISTON
-			self::registerBlock(new Cobweb());
-			self::registerBlock(new TallGrass());
-			self::registerBlock(new DeadBush());
-			//TODO: PISTON
-			//TODO: PISTONARMCOLLISION
-			self::registerBlock(new Wool());
+		self::registerBlock(new Air());
+		self::registerBlock(new Stone());
+		self::registerBlock(new Grass());
+		self::registerBlock(new Dirt());
+		self::registerBlock(new Cobblestone());
+		self::registerBlock(new Planks());
+		self::registerBlock(new Sapling());
+		self::registerBlock(new Bedrock());
+		self::registerBlock(new Water());
+		self::registerBlock(new StillWater());
+		self::registerBlock(new Lava());
+		self::registerBlock(new StillLava());
+		self::registerBlock(new Sand());
+		self::registerBlock(new Gravel());
+		self::registerBlock(new GoldOre());
+		self::registerBlock(new IronOre());
+		self::registerBlock(new CoalOre());
+		self::registerBlock(new Wood());
+		self::registerBlock(new Leaves());
+		self::registerBlock(new Sponge());
+		self::registerBlock(new Glass());
+		self::registerBlock(new LapisOre());
+		self::registerBlock(new Lapis());
+		//TODO: DISPENSER
+		self::registerBlock(new Sandstone());
+		self::registerBlock(new NoteBlock());
+		self::registerBlock(new Bed());
+		self::registerBlock(new PoweredRail());
+		self::registerBlock(new DetectorRail());
+		//TODO: STICKY_PISTON
+		self::registerBlock(new Cobweb());
+		self::registerBlock(new TallGrass());
+		self::registerBlock(new DeadBush());
+		//TODO: PISTON
+		//TODO: PISTONARMCOLLISION
+		self::registerBlock(new Wool());
 
-			self::registerBlock(new Dandelion());
-			self::registerBlock(new Flower());
-			self::registerBlock(new BrownMushroom());
-			self::registerBlock(new RedMushroom());
-			self::registerBlock(new Gold());
-			self::registerBlock(new Iron());
-			self::registerBlock(new DoubleStoneSlab());
-			self::registerBlock(new StoneSlab());
-			self::registerBlock(new Bricks());
-			self::registerBlock(new TNT());
-			self::registerBlock(new Bookshelf());
-			self::registerBlock(new MossyCobblestone());
-			self::registerBlock(new Obsidian());
-			self::registerBlock(new Torch());
-			self::registerBlock(new Fire());
-			self::registerBlock(new MonsterSpawner());
-			self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
-			self::registerBlock(new Chest());
-			//TODO: REDSTONE_WIRE
-			self::registerBlock(new DiamondOre());
-			self::registerBlock(new Diamond());
-			self::registerBlock(new CraftingTable());
-			self::registerBlock(new Wheat());
-			self::registerBlock(new Farmland());
-			self::registerBlock(new Furnace());
-			self::registerBlock(new BurningFurnace());
-			self::registerBlock(new SignPost());
-			self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
-			self::registerBlock(new Ladder());
-			self::registerBlock(new Rail());
-			self::registerBlock(new CobblestoneStairs());
-			self::registerBlock(new WallSign());
-			self::registerBlock(new Lever());
-			self::registerBlock(new StonePressurePlate());
-			self::registerBlock(new IronDoor());
-			self::registerBlock(new WoodenPressurePlate());
-			self::registerBlock(new RedstoneOre());
-			self::registerBlock(new GlowingRedstoneOre());
-			self::registerBlock(new RedstoneTorchUnlit());
-			self::registerBlock(new RedstoneTorch());
-			self::registerBlock(new StoneButton());
-			self::registerBlock(new SnowLayer());
-			self::registerBlock(new Ice());
-			self::registerBlock(new Snow());
-			self::registerBlock(new Cactus());
-			self::registerBlock(new Clay());
-			self::registerBlock(new Sugarcane());
-			//TODO: JUKEBOX
-			self::registerBlock(new WoodenFence());
-			self::registerBlock(new Pumpkin());
-			self::registerBlock(new Netherrack());
-			self::registerBlock(new SoulSand());
-			self::registerBlock(new Glowstone());
-			//TODO: PORTAL
-			self::registerBlock(new LitPumpkin());
-			self::registerBlock(new Cake());
-			//TODO: REPEATER_BLOCK
-			//TODO: POWERED_REPEATER
-			//TODO: INVISIBLEBEDROCK
-			self::registerBlock(new Trapdoor());
-			//TODO: MONSTER_EGG
-			self::registerBlock(new StoneBricks());
-			self::registerBlock(new BrownMushroomBlock());
-			self::registerBlock(new RedMushroomBlock());
-			self::registerBlock(new IronBars());
-			self::registerBlock(new GlassPane());
-			self::registerBlock(new Melon());
-			self::registerBlock(new PumpkinStem());
-			self::registerBlock(new MelonStem());
-			self::registerBlock(new Vine());
-			self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
-			self::registerBlock(new BrickStairs());
-			self::registerBlock(new StoneBrickStairs());
-			self::registerBlock(new Mycelium());
-			self::registerBlock(new WaterLily());
-			self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
-			self::registerBlock(new NetherBrickFence());
-			self::registerBlock(new NetherBrickStairs());
-			self::registerBlock(new NetherWartPlant());
-			self::registerBlock(new EnchantingTable());
-			self::registerBlock(new BrewingStand());
-			//TODO: CAULDRON_BLOCK
-			//TODO: END_PORTAL
-			self::registerBlock(new EndPortalFrame());
-			self::registerBlock(new EndStone());
-			//TODO: DRAGON_EGG
-			self::registerBlock(new RedstoneLamp());
-			self::registerBlock(new LitRedstoneLamp());
-			//TODO: DROPPER
-			self::registerBlock(new ActivatorRail());
-			self::registerBlock(new CocoaBlock());
-			self::registerBlock(new SandstoneStairs());
-			self::registerBlock(new EmeraldOre());
-			self::registerBlock(new EnderChest());
-			self::registerBlock(new TripwireHook());
-			self::registerBlock(new Tripwire());
-			self::registerBlock(new Emerald());
-			self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs"));
-			self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs"));
-			self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs"));
-			//TODO: COMMAND_BLOCK
-			//TODO: BEACON
-			self::registerBlock(new CobblestoneWall());
-			self::registerBlock(new FlowerPot());
-			self::registerBlock(new Carrot());
-			self::registerBlock(new Potato());
-			self::registerBlock(new WoodenButton());
-			self::registerBlock(new Skull());
-			self::registerBlock(new Anvil());
-			self::registerBlock(new TrappedChest());
-			self::registerBlock(new WeightedPressurePlateLight());
-			self::registerBlock(new WeightedPressurePlateHeavy());
-			//TODO: COMPARATOR_BLOCK
-			//TODO: POWERED_COMPARATOR
-			self::registerBlock(new DaylightSensor());
-			self::registerBlock(new Redstone());
-			self::registerBlock(new NetherQuartzOre());
-			//TODO: HOPPER_BLOCK
-			self::registerBlock(new Quartz());
-			self::registerBlock(new QuartzStairs());
-			self::registerBlock(new DoubleWoodenSlab());
-			self::registerBlock(new WoodenSlab());
-			self::registerBlock(new StainedClay());
-			self::registerBlock(new StainedGlassPane());
-			self::registerBlock(new Leaves2());
-			self::registerBlock(new Wood2());
-			self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
-			self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
-			//TODO: SLIME
+		self::registerBlock(new Dandelion());
+		self::registerBlock(new Flower());
+		self::registerBlock(new BrownMushroom());
+		self::registerBlock(new RedMushroom());
+		self::registerBlock(new Gold());
+		self::registerBlock(new Iron());
+		self::registerBlock(new DoubleStoneSlab());
+		self::registerBlock(new StoneSlab());
+		self::registerBlock(new Bricks());
+		self::registerBlock(new TNT());
+		self::registerBlock(new Bookshelf());
+		self::registerBlock(new MossyCobblestone());
+		self::registerBlock(new Obsidian());
+		self::registerBlock(new Torch());
+		self::registerBlock(new Fire());
+		self::registerBlock(new MonsterSpawner());
+		self::registerBlock(new WoodenStairs(Block::OAK_STAIRS, 0, "Oak Stairs"));
+		self::registerBlock(new Chest());
+		//TODO: REDSTONE_WIRE
+		self::registerBlock(new DiamondOre());
+		self::registerBlock(new Diamond());
+		self::registerBlock(new CraftingTable());
+		self::registerBlock(new Wheat());
+		self::registerBlock(new Farmland());
+		self::registerBlock(new Furnace());
+		self::registerBlock(new BurningFurnace());
+		self::registerBlock(new SignPost());
+		self::registerBlock(new WoodenDoor(Block::OAK_DOOR_BLOCK, 0, "Oak Door", Item::OAK_DOOR));
+		self::registerBlock(new Ladder());
+		self::registerBlock(new Rail());
+		self::registerBlock(new CobblestoneStairs());
+		self::registerBlock(new WallSign());
+		self::registerBlock(new Lever());
+		self::registerBlock(new StonePressurePlate());
+		self::registerBlock(new IronDoor());
+		self::registerBlock(new WoodenPressurePlate());
+		self::registerBlock(new RedstoneOre());
+		self::registerBlock(new GlowingRedstoneOre());
+		self::registerBlock(new RedstoneTorchUnlit());
+		self::registerBlock(new RedstoneTorch());
+		self::registerBlock(new StoneButton());
+		self::registerBlock(new SnowLayer());
+		self::registerBlock(new Ice());
+		self::registerBlock(new Snow());
+		self::registerBlock(new Cactus());
+		self::registerBlock(new Clay());
+		self::registerBlock(new Sugarcane());
+		//TODO: JUKEBOX
+		self::registerBlock(new WoodenFence());
+		self::registerBlock(new Pumpkin());
+		self::registerBlock(new Netherrack());
+		self::registerBlock(new SoulSand());
+		self::registerBlock(new Glowstone());
+		//TODO: PORTAL
+		self::registerBlock(new LitPumpkin());
+		self::registerBlock(new Cake());
+		//TODO: REPEATER_BLOCK
+		//TODO: POWERED_REPEATER
+		//TODO: INVISIBLEBEDROCK
+		self::registerBlock(new Trapdoor());
+		//TODO: MONSTER_EGG
+		self::registerBlock(new StoneBricks());
+		self::registerBlock(new BrownMushroomBlock());
+		self::registerBlock(new RedMushroomBlock());
+		self::registerBlock(new IronBars());
+		self::registerBlock(new GlassPane());
+		self::registerBlock(new Melon());
+		self::registerBlock(new PumpkinStem());
+		self::registerBlock(new MelonStem());
+		self::registerBlock(new Vine());
+		self::registerBlock(new FenceGate(Block::OAK_FENCE_GATE, 0, "Oak Fence Gate"));
+		self::registerBlock(new BrickStairs());
+		self::registerBlock(new StoneBrickStairs());
+		self::registerBlock(new Mycelium());
+		self::registerBlock(new WaterLily());
+		self::registerBlock(new NetherBrick(Block::NETHER_BRICK_BLOCK, 0, "Nether Bricks"));
+		self::registerBlock(new NetherBrickFence());
+		self::registerBlock(new NetherBrickStairs());
+		self::registerBlock(new NetherWartPlant());
+		self::registerBlock(new EnchantingTable());
+		self::registerBlock(new BrewingStand());
+		//TODO: CAULDRON_BLOCK
+		//TODO: END_PORTAL
+		self::registerBlock(new EndPortalFrame());
+		self::registerBlock(new EndStone());
+		//TODO: DRAGON_EGG
+		self::registerBlock(new RedstoneLamp());
+		self::registerBlock(new LitRedstoneLamp());
+		//TODO: DROPPER
+		self::registerBlock(new ActivatorRail());
+		self::registerBlock(new CocoaBlock());
+		self::registerBlock(new SandstoneStairs());
+		self::registerBlock(new EmeraldOre());
+		self::registerBlock(new EnderChest());
+		self::registerBlock(new TripwireHook());
+		self::registerBlock(new Tripwire());
+		self::registerBlock(new Emerald());
+		self::registerBlock(new WoodenStairs(Block::SPRUCE_STAIRS, 0, "Spruce Stairs"));
+		self::registerBlock(new WoodenStairs(Block::BIRCH_STAIRS, 0, "Birch Stairs"));
+		self::registerBlock(new WoodenStairs(Block::JUNGLE_STAIRS, 0, "Jungle Stairs"));
+		//TODO: COMMAND_BLOCK
+		//TODO: BEACON
+		self::registerBlock(new CobblestoneWall());
+		self::registerBlock(new FlowerPot());
+		self::registerBlock(new Carrot());
+		self::registerBlock(new Potato());
+		self::registerBlock(new WoodenButton());
+		self::registerBlock(new Skull());
+		self::registerBlock(new Anvil());
+		self::registerBlock(new TrappedChest());
+		self::registerBlock(new WeightedPressurePlateLight());
+		self::registerBlock(new WeightedPressurePlateHeavy());
+		//TODO: COMPARATOR_BLOCK
+		//TODO: POWERED_COMPARATOR
+		self::registerBlock(new DaylightSensor());
+		self::registerBlock(new Redstone());
+		self::registerBlock(new NetherQuartzOre());
+		//TODO: HOPPER_BLOCK
+		self::registerBlock(new Quartz());
+		self::registerBlock(new QuartzStairs());
+		self::registerBlock(new DoubleWoodenSlab());
+		self::registerBlock(new WoodenSlab());
+		self::registerBlock(new StainedClay());
+		self::registerBlock(new StainedGlassPane());
+		self::registerBlock(new Leaves2());
+		self::registerBlock(new Wood2());
+		self::registerBlock(new WoodenStairs(Block::ACACIA_STAIRS, 0, "Acacia Stairs"));
+		self::registerBlock(new WoodenStairs(Block::DARK_OAK_STAIRS, 0, "Dark Oak Stairs"));
+		//TODO: SLIME
 
-			self::registerBlock(new IronTrapdoor());
-			self::registerBlock(new Prismarine());
-			self::registerBlock(new SeaLantern());
-			self::registerBlock(new HayBale());
-			self::registerBlock(new Carpet());
-			self::registerBlock(new HardenedClay());
-			self::registerBlock(new Coal());
-			self::registerBlock(new PackedIce());
-			self::registerBlock(new DoublePlant());
-			self::registerBlock(new StandingBanner());
-			self::registerBlock(new WallBanner());
-			//TODO: DAYLIGHT_DETECTOR_INVERTED
-			self::registerBlock(new RedSandstone());
-			self::registerBlock(new RedSandstoneStairs());
-			self::registerBlock(new DoubleStoneSlab2());
-			self::registerBlock(new StoneSlab2());
-			self::registerBlock(new FenceGate(Block::SPRUCE_FENCE_GATE, 0, "Spruce Fence Gate"));
-			self::registerBlock(new FenceGate(Block::BIRCH_FENCE_GATE, 0, "Birch Fence Gate"));
-			self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate"));
-			self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate"));
-			self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
-			//TODO: REPEATING_COMMAND_BLOCK
-			//TODO: CHAIN_COMMAND_BLOCK
+		self::registerBlock(new IronTrapdoor());
+		self::registerBlock(new Prismarine());
+		self::registerBlock(new SeaLantern());
+		self::registerBlock(new HayBale());
+		self::registerBlock(new Carpet());
+		self::registerBlock(new HardenedClay());
+		self::registerBlock(new Coal());
+		self::registerBlock(new PackedIce());
+		self::registerBlock(new DoublePlant());
+		self::registerBlock(new StandingBanner());
+		self::registerBlock(new WallBanner());
+		//TODO: DAYLIGHT_DETECTOR_INVERTED
+		self::registerBlock(new RedSandstone());
+		self::registerBlock(new RedSandstoneStairs());
+		self::registerBlock(new DoubleStoneSlab2());
+		self::registerBlock(new StoneSlab2());
+		self::registerBlock(new FenceGate(Block::SPRUCE_FENCE_GATE, 0, "Spruce Fence Gate"));
+		self::registerBlock(new FenceGate(Block::BIRCH_FENCE_GATE, 0, "Birch Fence Gate"));
+		self::registerBlock(new FenceGate(Block::JUNGLE_FENCE_GATE, 0, "Jungle Fence Gate"));
+		self::registerBlock(new FenceGate(Block::DARK_OAK_FENCE_GATE, 0, "Dark Oak Fence Gate"));
+		self::registerBlock(new FenceGate(Block::ACACIA_FENCE_GATE, 0, "Acacia Fence Gate"));
+		//TODO: REPEATING_COMMAND_BLOCK
+		//TODO: CHAIN_COMMAND_BLOCK
 
-			self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR));
-			self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR));
-			self::registerBlock(new WoodenDoor(Block::JUNGLE_DOOR_BLOCK, 0, "Jungle Door", Item::JUNGLE_DOOR));
-			self::registerBlock(new WoodenDoor(Block::ACACIA_DOOR_BLOCK, 0, "Acacia Door", Item::ACACIA_DOOR));
-			self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR));
-			self::registerBlock(new GrassPath());
-			self::registerBlock(new ItemFrame());
-			//TODO: CHORUS_FLOWER
-			self::registerBlock(new Purpur());
+		self::registerBlock(new WoodenDoor(Block::SPRUCE_DOOR_BLOCK, 0, "Spruce Door", Item::SPRUCE_DOOR));
+		self::registerBlock(new WoodenDoor(Block::BIRCH_DOOR_BLOCK, 0, "Birch Door", Item::BIRCH_DOOR));
+		self::registerBlock(new WoodenDoor(Block::JUNGLE_DOOR_BLOCK, 0, "Jungle Door", Item::JUNGLE_DOOR));
+		self::registerBlock(new WoodenDoor(Block::ACACIA_DOOR_BLOCK, 0, "Acacia Door", Item::ACACIA_DOOR));
+		self::registerBlock(new WoodenDoor(Block::DARK_OAK_DOOR_BLOCK, 0, "Dark Oak Door", Item::DARK_OAK_DOOR));
+		self::registerBlock(new GrassPath());
+		self::registerBlock(new ItemFrame());
+		//TODO: CHORUS_FLOWER
+		self::registerBlock(new Purpur());
 
-			self::registerBlock(new PurpurStairs());
+		self::registerBlock(new PurpurStairs());
 
-			//TODO: UNDYED_SHULKER_BOX
-			self::registerBlock(new EndStoneBricks());
-			//TODO: FROSTED_ICE
-			self::registerBlock(new EndRod());
-			//TODO: END_GATEWAY
+		//TODO: UNDYED_SHULKER_BOX
+		self::registerBlock(new EndStoneBricks());
+		//TODO: FROSTED_ICE
+		self::registerBlock(new EndRod());
+		//TODO: END_GATEWAY
 
-			self::registerBlock(new Magma());
-			self::registerBlock(new NetherWartBlock());
-			self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
-			self::registerBlock(new BoneBlock());
+		self::registerBlock(new Magma());
+		self::registerBlock(new NetherWartBlock());
+		self::registerBlock(new NetherBrick(Block::RED_NETHER_BRICK, 0, "Red Nether Bricks"));
+		self::registerBlock(new BoneBlock());
 
-			//TODO: SHULKER_BOX
-			self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::MAGENTA_GLAZED_TERRACOTTA, 0, "Magenta Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::LIGHT_BLUE_GLAZED_TERRACOTTA, 0, "Light Blue Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::LIME_GLAZED_TERRACOTTA, 0, "Lime Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::PINK_GLAZED_TERRACOTTA, 0, "Pink Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::GRAY_GLAZED_TERRACOTTA, 0, "Grey Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::SILVER_GLAZED_TERRACOTTA, 0, "Light Grey Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::CYAN_GLAZED_TERRACOTTA, 0, "Cyan Glazed Terracotta"));
+		//TODO: SHULKER_BOX
+		self::registerBlock(new GlazedTerracotta(Block::PURPLE_GLAZED_TERRACOTTA, 0, "Purple Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::WHITE_GLAZED_TERRACOTTA, 0, "White Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::ORANGE_GLAZED_TERRACOTTA, 0, "Orange Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::MAGENTA_GLAZED_TERRACOTTA, 0, "Magenta Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::LIGHT_BLUE_GLAZED_TERRACOTTA, 0, "Light Blue Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::YELLOW_GLAZED_TERRACOTTA, 0, "Yellow Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::LIME_GLAZED_TERRACOTTA, 0, "Lime Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::PINK_GLAZED_TERRACOTTA, 0, "Pink Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::GRAY_GLAZED_TERRACOTTA, 0, "Grey Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::SILVER_GLAZED_TERRACOTTA, 0, "Light Grey Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::CYAN_GLAZED_TERRACOTTA, 0, "Cyan Glazed Terracotta"));
 
-			self::registerBlock(new GlazedTerracotta(Block::BLUE_GLAZED_TERRACOTTA, 0, "Blue Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::BROWN_GLAZED_TERRACOTTA, 0, "Brown Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::GREEN_GLAZED_TERRACOTTA, 0, "Green Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
-			self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
-			self::registerBlock(new Concrete());
-			self::registerBlock(new ConcretePowder());
+		self::registerBlock(new GlazedTerracotta(Block::BLUE_GLAZED_TERRACOTTA, 0, "Blue Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::BROWN_GLAZED_TERRACOTTA, 0, "Brown Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::GREEN_GLAZED_TERRACOTTA, 0, "Green Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::RED_GLAZED_TERRACOTTA, 0, "Red Glazed Terracotta"));
+		self::registerBlock(new GlazedTerracotta(Block::BLACK_GLAZED_TERRACOTTA, 0, "Black Glazed Terracotta"));
+		self::registerBlock(new Concrete());
+		self::registerBlock(new ConcretePowder());
 
-			//TODO: CHORUS_PLANT
-			self::registerBlock(new StainedGlass());
+		//TODO: CHORUS_PLANT
+		self::registerBlock(new StainedGlass());
 
-			self::registerBlock(new Podzol());
-			self::registerBlock(new Beetroot());
-			self::registerBlock(new Stonecutter());
-			self::registerBlock(new GlowingObsidian());
-			self::registerBlock(new NetherReactor());
-			//TODO: INFO_UPDATE
-			//TODO: INFO_UPDATE2
-			//TODO: MOVINGBLOCK
-			//TODO: OBSERVER
-			//TODO: STRUCTURE_BLOCK
+		self::registerBlock(new Podzol());
+		self::registerBlock(new Beetroot());
+		self::registerBlock(new Stonecutter());
+		self::registerBlock(new GlowingObsidian());
+		self::registerBlock(new NetherReactor());
+		//TODO: INFO_UPDATE
+		//TODO: INFO_UPDATE2
+		//TODO: MOVINGBLOCK
+		//TODO: OBSERVER
+		//TODO: STRUCTURE_BLOCK
 
-			//TODO: RESERVED6
+		//TODO: RESERVED6
 
-			foreach(self::$list as $id => $block){
-				if($block === null){
-					self::registerBlock(new UnknownBlock($id));
-				}
+		foreach(self::$list as $id => $block){
+			if($block === null){
+				self::registerBlock(new UnknownBlock($id));
 			}
 		}
+
+		/** @var mixed[] $runtimeIdMap */
+		$runtimeIdMap = json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . "runtimeid_table.json"), true);
+		foreach($runtimeIdMap as $obj){
+			self::registerMapping($obj["runtimeID"], $obj["id"], $obj["data"]);
+		}
 	}
 
 	/**
@@ -390,9 +402,9 @@ class BlockFactory{
 		}
 
 		if($pos !== null){
-			$block->x = $pos->x;
-			$block->y = $pos->y;
-			$block->z = $pos->z;
+			$block->x = $pos->getFloorX();
+			$block->y = $pos->getFloorY();
+			$block->z = $pos->getFloorZ();
 			$block->level = $pos->level;
 		}
 
@@ -417,4 +429,46 @@ class BlockFactory{
 		$b = self::$list[$id];
 		return $b !== null and !($b instanceof UnknownBlock);
 	}
+
+	/**
+	 * @internal
+	 *
+	 * @param int $id
+	 * @param int $meta
+	 *
+	 * @return int
+	 */
+	public static function toStaticRuntimeId(int $id, int $meta = 0) : int{
+		if($id === Block::AIR){
+			//TODO: HACK! (weird air blocks with non-zero damage values shouldn't turn into update! blocks)
+			$meta = 0;
+		}
+
+		$index = ($id << 4) | $meta;
+		if(!isset(self::$staticRuntimeIdMap[$index])){
+			self::registerMapping($rtId = ++self::$lastRuntimeId, $id, $meta);
+			MainLogger::getLogger()->error("ID $id meta $meta does not have a corresponding block static runtime ID, added a new unknown runtime ID ($rtId)");
+			return $rtId;
+		}
+
+		return self::$staticRuntimeIdMap[$index];
+	}
+
+	/**
+	 * @internal
+	 *
+	 * @param int $runtimeId
+	 *
+	 * @return int[] [id, meta]
+	 */
+	public static function fromStaticRuntimeId(int $runtimeId) : array{
+		$v = self::$legacyIdMap[$runtimeId];
+		return [$v >> 4, $v & 0xf];
+	}
+
+	private static function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{
+		self::$staticRuntimeIdMap[($legacyId << 4) | $legacyMeta] = $staticRuntimeId;
+		self::$legacyIdMap[$staticRuntimeId] = ($legacyId << 4) | $legacyMeta;
+		self::$lastRuntimeId = max(self::$lastRuntimeId, $staticRuntimeId);
+	}
 }

src/pocketmine/block/Bookshelf.php

@@ -56,4 +56,11 @@ class Bookshelf extends Solid{
 		return 300;
 	}
 
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Cactus.php

@@ -28,7 +28,6 @@ use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -66,50 +65,49 @@ class Cactus extends Transparent{
 		);
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onEntityCollide(Entity $entity) : void{
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
 		$entity->attack($ev);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
-			if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
-				$this->getLevel()->useBreakOn($this);
-			}else{
-				for($side = 2; $side <= 5; ++$side){
-					$b = $this->getSide($side);
-					if(!$b->canBeFlowedInto()){
-						$this->getLevel()->useBreakOn($this);
-					}
-				}
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
-				if($this->meta === 0x0f){
-					for($y = 1; $y < 3; ++$y){
-						$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
-						if($b->getId() === self::AIR){
-							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
-							if(!$ev->isCancelled()){
-								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
-							}
-						}
-					}
-					$this->meta = 0;
-					$this->getLevel()->setBlock($this, $this);
-				}else{
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this);
+	public function onNearbyBlockChange() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){
+			$this->getLevel()->useBreakOn($this);
+		}else{
+			for($side = 2; $side <= 5; ++$side){
+				$b = $this->getSide($side);
+				if(!$b->canBeFlowedInto()){
+					$this->getLevel()->useBreakOn($this);
+					break;
 				}
 			}
 		}
+	}
 
-		return false;
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){
+			if($this->meta === 0x0f){
+				for($y = 1; $y < 3; ++$y){
+					$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
+					if($b->getId() === self::AIR){
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, BlockFactory::get(Block::CACTUS)));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+						}
+					}
+				}
+				$this->meta = 0;
+				$this->getLevel()->setBlock($this, $this);
+			}else{
+				++$this->meta;
+				$this->getLevel()->setBlock($this, $this);
+			}
+		}
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
@@ -119,7 +117,7 @@ class Cactus extends Transparent{
 			$block1 = $this->getSide(Vector3::SIDE_SOUTH);
 			$block2 = $this->getSide(Vector3::SIDE_WEST);
 			$block3 = $this->getSide(Vector3::SIDE_EAST);
-			if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){
+			if($block0->isTransparent() and $block1->isTransparent() and $block2->isTransparent() and $block3->isTransparent()){
 				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;

src/pocketmine/block/Cake.php

@@ -23,11 +23,10 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\entity\Effect;
+use pocketmine\entity\EffectInstance;
 use pocketmine\entity\Living;
 use pocketmine\item\FoodSource;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -73,16 +72,10 @@ class Cake extends Transparent implements FoodSource{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
 		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{
@@ -127,7 +120,7 @@ class Cake extends Transparent implements FoodSource{
 	}
 
 	/**
-	 * @return Effect[]
+	 * @return EffectInstance[]
 	 */
 	public function getAdditionalEffects() : array{
 		return [];

src/pocketmine/block/Carpet.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -73,16 +72,17 @@ class Carpet extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Coal.php

@@ -52,4 +52,12 @@ class Coal extends Solid{
 	public function getFuelTime() : int{
 		return 16000;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 5;
+	}
 }

src/pocketmine/block/ConcretePowder.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\block\utils\ColorBlockMetaHelper;
-use pocketmine\level\Level;
 
 class ConcretePowder extends Fallable{
 
@@ -46,13 +45,12 @@ class ConcretePowder extends Fallable{
 		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL and ($block = $this->checkAdjacentWater()) !== null){
+	public function onNearbyBlockChange() : void{
+		if(($block = $this->checkAdjacentWater()) !== null){
 			$this->level->setBlock($this, $block);
-			return $type;
+		}else{
+			parent::onNearbyBlockChange();
 		}
-
-		return parent::onUpdate($type);
 	}
 
 	/**

src/pocketmine/block/CraftingTable.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\inventory\BigCraftingGrid;
+use pocketmine\inventory\CraftingGrid;
 use pocketmine\item\Item;
 use pocketmine\Player;
 
@@ -49,7 +49,7 @@ class CraftingTable extends Solid{
 
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($player instanceof Player){
-			$player->setCraftingGrid(new BigCraftingGrid($player));
+			$player->setCraftingGrid(new CraftingGrid($player, CraftingGrid::SIZE_BIG));
 		}
 
 		return true;

src/pocketmine/block/Crops.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -65,35 +64,28 @@ abstract class Crops extends Flowable{
 		return false;
 	}
 
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
 	public function ticksRandomly() : bool{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) === 1){
-				if($this->meta < 0x07){
-					$block = clone $this;
-					++$block->meta;
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+	public function onRandomTick() : void{
+		if(mt_rand(0, 2) === 1){
+			if($this->meta < 0x07){
+				$block = clone $this;
+				++$block->meta;
+				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
 
-					if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
-					}else{
-						return Level::BLOCK_UPDATE_RANDOM;
-					}
+				if(!$ev->isCancelled()){
+					$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
 				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
-
-		return false;
 	}
 
 	public function isAffectedBySilkTouch() : bool{

src/pocketmine/block/Dandelion.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -52,15 +51,17 @@ class Dandelion extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
 		}
+	}
 
-		return false;
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
 	}
 }

src/pocketmine/block/DeadBush.php

@@ -25,8 +25,8 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
+use pocketmine\Player;
 
 class DeadBush extends Flowable{
 
@@ -40,18 +40,20 @@ class DeadBush extends Flowable{
 		return "Dead Bush";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 		}
 
 		return false;
 	}
 
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
+
 	public function getToolType() : int{
 		return BlockToolType::TYPE_SHEARS;
 	}
@@ -69,4 +71,12 @@ class DeadBush extends Flowable{
 
 		return parent::getDrops($item);
 	}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
 }

src/pocketmine/block/Door.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
@@ -201,26 +200,20 @@ abstract class Door extends Transparent{
 		return $bb;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
-				if($this->getSide(Vector3::SIDE_UP) instanceof Door){
-					$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
-				}
-
-				return Level::BLOCK_UPDATE_NORMAL;
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false);
+			if($this->getSide(Vector3::SIDE_UP) instanceof Door){
+				$this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), BlockFactory::get(Block::AIR), false);
 			}
 		}
-
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($face === Vector3::SIDE_UP){
 			$blockUp = $this->getSide(Vector3::SIDE_UP);
 			$blockDown = $this->getSide(Vector3::SIDE_DOWN);
-			if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){
+			if(!$blockUp->canBeReplaced() or $blockDown->isTransparent()){
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
@@ -233,13 +226,13 @@ abstract class Door extends Transparent{
 			$next = $this->getSide($faces[($direction + 2) % 4]);
 			$next2 = $this->getSide($faces[$direction]);
 			$metaUp = 0x08;
-			if($next->getId() === $this->getId() or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
+			if($next->getId() === $this->getId() or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge
 				$metaUp |= 0x01;
 			}
 
 			$this->setDamage($player->getDirection() & 0x03);
 			$this->getLevel()->setBlock($blockReplace, $this, true, true); //Bottom
-			$this->getLevel()->setBlock($blockUp, $b = BlockFactory::get($this->getId(), $metaUp), true); //Top
+			$this->getLevel()->setBlock($blockUp, BlockFactory::get($this->getId(), $metaUp), true); //Top
 			return true;
 		}
 

src/pocketmine/block/DoublePlant.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -84,17 +83,10 @@ class DoublePlant extends Flowable{
 		);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
-			if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $down->isTransparent())){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if(!$this->isValidHalfPlant() or (($this->meta & self::BITFLAG_TOP) === 0 and $this->getSide(Vector3::SIDE_DOWN)->isTransparent())){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function getVariantBitmask() : int{

src/pocketmine/block/DoubleWoodenSlab.php

@@ -38,4 +38,12 @@ class DoubleWoodenSlab extends DoubleSlab{
 	public function getToolType() : int{
 		return BlockToolType::TYPE_AXE;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Fallable.php

@@ -24,26 +24,23 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
 abstract class Fallable extends Solid{
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
-			if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
-				$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
+	public function onNearbyBlockChange() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->getId() === self::AIR or $down instanceof Liquid or $down instanceof Fire){
+			$this->level->setBlock($this, BlockFactory::get(Block::AIR), true);
 
-				$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
-				$nbt->setInt("TileID", $this->getId());
-				$nbt->setByte("Data", $this->getDamage());
+			$nbt = Entity::createBaseNBT($this->add(0.5, 0, 0.5));
+			$nbt->setInt("TileID", $this->getId());
+			$nbt->setByte("Data", $this->getDamage());
 
-				$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
+			$fall = Entity::createEntity("FallingSand", $this->getLevel(), $nbt);
 
-				if($fall !== null){
-					$fall->spawnToAll();
-				}
+			if($fall !== null){
+				$fall->spawnToAll();
 			}
 		}
 	}

src/pocketmine/block/Farmland.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -49,9 +48,6 @@ class Farmland extends Transparent{
 		return BlockToolType::TYPE_SHOVEL;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
 
 	protected function recalculateBoundingBox() : ?AxisAlignedBB{
 		return new AxisAlignedBB(
@@ -64,29 +60,28 @@ class Farmland extends Transparent{
 		);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
 			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
-			return $type;
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(!$this->canHydrate()){
-				if($this->meta > 0){
-					$this->meta--;
-					$this->level->setBlock($this, $this, false, false);
-				}else{
-					$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
-				}
-
-				return $type;
-			}elseif($this->meta < 7){
-				$this->meta = 7;
-				$this->level->setBlock($this, $this, false, false);
-
-				return $type;
-			}
 		}
+	}
 
-		return false;
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if(!$this->canHydrate()){
+			if($this->meta > 0){
+				$this->meta--;
+				$this->level->setBlock($this, $this, false, false);
+			}else{
+				$this->level->setBlock($this, BlockFactory::get(Block::DIRT), false, true);
+			}
+		}elseif($this->meta < 7){
+			$this->meta = 7;
+			$this->level->setBlock($this, $this, false, false);
+		}
 	}
 
 	protected function canHydrate() : bool{

src/pocketmine/block/FenceGate.php

@@ -94,4 +94,12 @@ class FenceGate extends Transparent{
 	public function getFuelTime() : int{
 		return 300;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Fire.php

@@ -25,11 +25,11 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\entity\projectile\Arrow;
+use pocketmine\event\block\BlockBurnEvent;
 use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -61,10 +61,6 @@ class Fire extends Flowable{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onEntityCollide(Entity $entity) : void{
 		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
 		$entity->attack($ev);
@@ -83,35 +79,90 @@ class Fire extends Flowable{
 		return [];
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			for($s = 0; $s <= 5; ++$s){
-				$side = $this->getSide($s);
-				if($side->getId() !== self::AIR and !($side instanceof Liquid)){
-					return false;
-				}
-			}
+	public function onNearbyBlockChange() : void{
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid() and !$this->hasAdjacentFlammableBlocks()){
 			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true);
+		}else{
+			$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
+		}
+	}
 
-			return Level::BLOCK_UPDATE_NORMAL;
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::NETHERRACK){
-				if(mt_rand(0, 2) === 0){
-					if($this->meta === 0x0F){
-						$this->level->setBlock($this, BlockFactory::get(Block::AIR));
-					}else{
-						$this->meta++;
-						$this->level->setBlock($this, $this);
-					}
+	public function ticksRandomly() : bool{
+		return true;
+	}
 
-					return Level::BLOCK_UPDATE_NORMAL;
+	public function onRandomTick() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+
+		$result = null;
+		if($this->meta < 15 and mt_rand(0, 2) === 0){
+			$this->meta++;
+			$result = $this;
+		}
+		$canSpread = true;
+
+		if(!$down->burnsForever()){
+			//TODO: check rain
+			if($this->meta === 15){
+				if(!$down->isFlammable() and mt_rand(0, 3) === 3){ //1/4 chance to extinguish
+					$canSpread = false;
+					$result = BlockFactory::get(Block::AIR);
+				}
+			}elseif(!$this->hasAdjacentFlammableBlocks()){
+				$canSpread = false;
+				if(!$down->isSolid() or $this->meta > 3){ //fire older than 3, or without a solid block below
+					$result = BlockFactory::get(Block::AIR);
 				}
 			}
+		}
+
+		if($result !== null){
+			$this->level->setBlock($this, $result);
+		}
+
+		$this->level->scheduleDelayedBlockUpdate($this, mt_rand(30, 40));
+
+		if($canSpread){
+			//TODO: raise upper bound for chance in humid biomes
+
+			foreach($this->getHorizontalSides() as $side){
+				$this->burnBlock($side, 300);
+			}
+
+			//vanilla uses a 250 upper bound here, but I don't think they intended to increase the chance of incineration
+			$this->burnBlock($this->getSide(Vector3::SIDE_UP), 350);
+			$this->burnBlock($this->getSide(Vector3::SIDE_DOWN), 350);
 
 			//TODO: fire spread
 		}
+	}
+
+	public function onScheduledUpdate() : void{
+		$this->onRandomTick();
+	}
+
+	private function hasAdjacentFlammableBlocks() : bool{
+		for($i = 0; $i <= 5; ++$i){
+			if($this->getSide($i)->isFlammable()){
+				return true;
+			}
+		}
 
 		return false;
 	}
 
+	private function burnBlock(Block $block, int $chanceBound) : void{
+		if(mt_rand(0, $chanceBound) < $block->getFlammability()){
+			$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockBurnEvent($block, $this));
+			if(!$ev->isCancelled()){
+				$block->onIncinerate();
+
+				if(mt_rand(0, $this->meta + 9) < 5){ //TODO: check rain
+					$this->level->setBlock($block, BlockFactory::get(Block::FIRE, min(15, $this->meta + (mt_rand(0, 4) >> 2))));
+				}else{
+					$this->level->setBlock($block, BlockFactory::get(Block::AIR));
+				}
+			}
+		}
+	}
 }

src/pocketmine/block/Flower.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -71,15 +70,17 @@ class Flower extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
 		}
+	}
 
-		return false;
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
 	}
 }

src/pocketmine/block/FlowerPot.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -68,16 +67,10 @@ class FlowerPot extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{

src/pocketmine/block/GlowingRedstoneOre.php

@@ -23,7 +23,8 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
+use pocketmine\item\Item;
+use pocketmine\Player;
 
 class GlowingRedstoneOre extends RedstoneOre{
 
@@ -39,13 +40,19 @@ class GlowingRedstoneOre extends RedstoneOre{
 		return 9;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_SCHEDULED or $type === Level::BLOCK_UPDATE_RANDOM){
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
-
-			return Level::BLOCK_UPDATE_WEAK;
-		}
-
+	public function onActivate(Item $item, Player $player = null) : bool{
 		return false;
 	}
+
+	public function onNearbyBlockChange() : void{
+
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::REDSTONE_ORE, $this->meta), false, false);
+	}
 }

src/pocketmine/block/Grass.php

@@ -27,7 +27,6 @@ use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\utils\Random;
@@ -62,43 +61,35 @@ class Grass extends Solid{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_RANDOM){
-			$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
-			if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
-				//grass dies
-				$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
+	public function onRandomTick() : void{
+		$lightAbove = $this->level->getFullLightAt($this->x, $this->y + 1, $this->z);
+		if($lightAbove < 4 and BlockFactory::$lightFilter[$this->level->getBlockIdAt($this->x, $this->y + 1, $this->z)] >= 3){ //2 plus 1 standard filter amount
+			//grass dies
+			$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($this, $this, BlockFactory::get(Block::DIRT)));
+			if(!$ev->isCancelled()){
+				$this->level->setBlock($this, $ev->getNewState(), false, false);
+			}
+		}elseif($lightAbove >= 9){
+			//try grass spread
+			for($i = 0; $i < 4; ++$i){
+				$x = mt_rand($this->x - 1, $this->x + 1);
+				$y = mt_rand($this->y - 3, $this->y + 1);
+				$z = mt_rand($this->z - 1, $this->z + 1);
+				if(
+					$this->level->getBlockIdAt($x, $y, $z) !== Block::DIRT or
+					$this->level->getBlockDataAt($x, $y, $z) === 1 or
+					$this->level->getFullLightAt($x, $y + 1, $z) < 4 or
+					BlockFactory::$lightFilter[$this->level->getBlockIdAt($x, $y + 1, $z)] >= 3
+				){
+					continue;
+				}
+
+				$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
 				if(!$ev->isCancelled()){
-					$this->level->setBlock($this, $ev->getNewState(), false, false);
+					$this->level->setBlock($b, $ev->getNewState(), false, false);
 				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
-			}elseif($lightAbove >= 9){
-				//try grass spread
-				for($i = 0; $i < 4; ++$i){
-					$x = mt_rand($this->x - 1, $this->x + 1);
-					$y = mt_rand($this->y - 3, $this->y + 1);
-					$z = mt_rand($this->z - 1, $this->z + 1);
-					if(
-						$this->level->getBlockIdAt($x, $y, $z) !== Block::DIRT or
-						$this->level->getBlockDataAt($x, $y, $z) === 1 or
-						$this->level->getFullLightAt($x, $y + 1, $z) < 4 or
-						BlockFactory::$lightFilter[$this->level->getBlockIdAt($x, $y + 1, $z)] >= 3
-					){
-						continue;
-					}
-
-					$this->level->getServer()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($b = $this->level->getBlockAt($x, $y, $z), $this, BlockFactory::get(Block::GRASS)));
-					if(!$ev->isCancelled()){
-						$this->level->setBlock($b, $ev->getNewState(), false, false);
-					}
-				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
-
-		return false;
 	}
 
 	public function onActivate(Item $item, Player $player = null) : bool{

src/pocketmine/block/GrassPath.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 
@@ -60,13 +59,10 @@ class GrassPath extends Transparent{
 		return 0.6;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL and $this->getSide(Vector3::SIDE_UP)->isSolid()){
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_UP)->isSolid()){
 			$this->level->setBlock($this, BlockFactory::get(Block::DIRT), true);
-			return $type;
 		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/HayBale.php

@@ -54,4 +54,12 @@ class HayBale extends Solid{
 	public function getVariantBitmask() : int{
 		return 0x03;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Ice.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\Player;
 
 class Ice extends Transparent{
@@ -67,15 +66,10 @@ class Ice extends Transparent{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
-				$this->level->useBreakOn($this);
-
-				return $type;
-			}
+	public function onRandomTick() : void{
+		if($this->level->getHighestAdjacentBlockLight($this->x, $this->y, $this->z) >= 12){
+			$this->level->useBreakOn($this);
 		}
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/IronBars.php

@@ -53,4 +53,3 @@ class IronBars extends Thin{
 		return 0;
 	}
 }
-

src/pocketmine/block/ItemFrame.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\tile\ItemFrame as TileItemFrame;
@@ -58,20 +57,16 @@ class ItemFrame extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$sides = [
-				0 => Vector3::SIDE_WEST,
-				1 => Vector3::SIDE_EAST,
-				2 => Vector3::SIDE_NORTH,
-				3 => Vector3::SIDE_SOUTH
-			];
-			if(!$this->getSide($sides[$this->meta])->isSolid()){
-				$this->level->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		$sides = [
+			0 => Vector3::SIDE_WEST,
+			1 => Vector3::SIDE_EAST,
+			2 => Vector3::SIDE_NORTH,
+			3 => Vector3::SIDE_SOUTH
+		];
+		if(!$this->getSide($sides[$this->meta])->isSolid()){
+			$this->level->useBreakOn($this);
 		}
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{

src/pocketmine/block/Ladder.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -91,7 +90,7 @@ class Ladder extends Transparent{
 
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
-		if($blockClicked->isTransparent() === false){
+		if(!$blockClicked->isTransparent()){
 			$faces = [
 				2 => 2,
 				3 => 3,
@@ -109,15 +108,10 @@ class Ladder extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if(!$this->getSide($this->meta ^ 0x01)->isSolid()){ //Replace with common break method
-				$this->level->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if(!$this->getSide($this->meta ^ 0x01)->isSolid()){ //Replace with common break method
+			$this->level->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function getToolType() : int{

src/pocketmine/block/Leaves.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -67,11 +66,8 @@ class Leaves extends Transparent{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
 
-	protected function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null){
+	protected function findLog(Block $pos, array $visited, $distance, &$check, $fromSide = null) : bool{
 		++$check;
 		$index = $pos->x . "." . $pos->y . "." . $pos->z;
 		if(isset($visited[$index])){
@@ -87,45 +83,45 @@ class Leaves extends Transparent{
 			}
 			if($fromSide === null){
 				for($side = 2; $side <= 5; ++$side){
-					if($this->findLog($pos->getSide($side), $visited, $distance + 1, $check, $side) === true){
+					if($this->findLog($pos->getSide($side), $visited, $distance + 1, $check, $side)){
 						return true;
 					}
 				}
 			}else{ //No more loops
 				switch($fromSide){
 					case 2:
-						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide) === true){
+						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide)){
 							return true;
 						}
 						break;
 					case 3:
-						if($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide) === true){
+						if($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide)){
 							return true;
 						}
 						break;
 					case 4:
-						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide) === true){
+						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide)){
 							return true;
 						}
 						break;
 					case 5:
-						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide) === true){
+						if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide)){
 							return true;
-						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide) === true){
+						}elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide)){
 							return true;
 						}
 						break;
@@ -136,31 +132,31 @@ class Leaves extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if(($this->meta & 0b00001100) === 0){
-				$this->meta |= 0x08;
-				$this->getLevel()->setBlock($this, $this, true, false);
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(($this->meta & 0b00001100) === 0x08){
-				$this->meta &= 0x03;
-				$visited = [];
-				$check = 0;
+	public function onNearbyBlockChange() : void{
+		if(($this->meta & 0b00001100) === 0){
+			$this->meta |= 0x08;
+			$this->getLevel()->setBlock($this, $this, true, false);
+		}
+	}
 
-				$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
+	public function ticksRandomly() : bool{
+		return true;
+	}
 
-				if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check) === true){
-					$this->getLevel()->setBlock($this, $this, false, false);
-				}else{
-					$this->getLevel()->useBreakOn($this);
+	public function onRandomTick() : void{
+		if(($this->meta & 0b00001100) === 0x08){
+			$this->meta &= 0x03;
+			$visited = [];
+			$check = 0;
 
-					return Level::BLOCK_UPDATE_NORMAL;
-				}
+			$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
+
+			if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check)){
+				$this->getLevel()->setBlock($this, $this, false, false);
+			}else{
+				$this->getLevel()->useBreakOn($this);
 			}
 		}
-
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
@@ -195,4 +191,12 @@ class Leaves extends Transparent{
 	public function canDropApples() : bool{
 		return $this->meta === self::OAK;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 60;
+	}
 }

src/pocketmine/block/Lever.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -74,26 +73,20 @@ class Lever extends Flowable{
 		return $this->level->setBlock($blockReplace, $this, true, true);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$faces = [
-				0 => Vector3::SIDE_UP,
-				1 => Vector3::SIDE_WEST,
-				2 => Vector3::SIDE_EAST,
-				3 => Vector3::SIDE_NORTH,
-				4 => Vector3::SIDE_SOUTH,
-				5 => Vector3::SIDE_DOWN,
-				6 => Vector3::SIDE_DOWN,
-				7 => Vector3::SIDE_UP
-			];
-			if(!$this->getSide($faces[$this->meta & 0x07])->isSolid()){
-				$this->level->useBreakOn($this);
-
-				return $type;
-			}
+	public function onNearbyBlockChange() : void{
+		$faces = [
+			0 => Vector3::SIDE_UP,
+			1 => Vector3::SIDE_WEST,
+			2 => Vector3::SIDE_EAST,
+			3 => Vector3::SIDE_NORTH,
+			4 => Vector3::SIDE_SOUTH,
+			5 => Vector3::SIDE_DOWN,
+			6 => Vector3::SIDE_DOWN,
+			7 => Vector3::SIDE_UP
+		];
+		if(!$this->getSide($faces[$this->meta & 0x07])->isSolid()){
+			$this->level->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	//TODO

src/pocketmine/block/Liquid.php

@@ -189,10 +189,12 @@ abstract class Liquid extends Transparent{
 	}
 
 	public function addVelocityToEntity(Entity $entity, Vector3 $vector) : void{
-		$flow = $this->getFlowVector();
-		$vector->x += $flow->x;
-		$vector->y += $flow->y;
-		$vector->z += $flow->z;
+		if($entity->canBeMovedByCurrents()){
+			$flow = $this->getFlowVector();
+			$vector->x += $flow->x;
+			$vector->y += $flow->y;
+			$vector->z += $flow->z;
+		}
 	}
 
 	abstract public function tickRate() : int;
@@ -206,101 +208,88 @@ abstract class Liquid extends Transparent{
 		return 1;
 	}
 
-	/**
-	 * {@inheritdoc}
-	 *
-	 * @param int $type
-	 *
-	 * @return bool|int
-	 */
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$this->checkForHarden();
-			$this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
+	public function onNearbyBlockChange() : void{
+		$this->checkForHarden();
+		$this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
+	}
 
-			return $type;
-		}elseif($type === Level::BLOCK_UPDATE_SCHEDULED){
-			$decay = $this->getFlowDecay($this);
-			$multiplier = $this->getFlowDecayPerBlock();
+	public function onScheduledUpdate() : void{
+		$decay = $this->getFlowDecay($this);
+		$multiplier = $this->getFlowDecayPerBlock();
 
-			if($decay > 0){
-				$smallestFlowDecay = -100;
-				$this->adjacentSources = 0;
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x, $this->y, $this->z - 1), $smallestFlowDecay);
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x, $this->y, $this->z + 1), $smallestFlowDecay);
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x - 1, $this->y, $this->z), $smallestFlowDecay);
-				$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x + 1, $this->y, $this->z), $smallestFlowDecay);
+		if($decay > 0){
+			$smallestFlowDecay = -100;
+			$this->adjacentSources = 0;
+			$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x, $this->y, $this->z - 1), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x, $this->y, $this->z + 1), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x - 1, $this->y, $this->z), $smallestFlowDecay);
+			$smallestFlowDecay = $this->getSmallestFlowDecay($this->level->getBlockAt($this->x + 1, $this->y, $this->z), $smallestFlowDecay);
 
-				$newDecay = $smallestFlowDecay + $multiplier;
+			$newDecay = $smallestFlowDecay + $multiplier;
 
-				if($newDecay >= 8 or $smallestFlowDecay < 0){
-					$newDecay = -1;
-				}
-
-				if(($topFlowDecay = $this->getFlowDecay($this->level->getBlockAt($this->x, $this->y + 1, $this->z))) >= 0){
-					$newDecay = $topFlowDecay | 0x08;
-				}
-
-				if($this->adjacentSources >= 2 and $this instanceof Water){
-					$bottomBlock = $this->level->getBlockAt($this->x, $this->y - 1, $this->z);
-					if($bottomBlock->isSolid()){
-						$newDecay = 0;
-					}elseif($bottomBlock instanceof Water and $bottomBlock->getDamage() === 0){
-						$newDecay = 0;
-					}
-				}
-
-				if($newDecay !== $decay){
-					$decay = $newDecay;
-					if($decay < 0){
-						$this->level->setBlock($this, BlockFactory::get(Block::AIR), true, true);
-					}else{
-						$this->level->setBlock($this, BlockFactory::get($this->id, $decay), true, true);
-						$this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
-					}
-				}
+			if($newDecay >= 8 or $smallestFlowDecay < 0){
+				$newDecay = -1;
 			}
 
-			if($decay >= 0){
+			if(($topFlowDecay = $this->getFlowDecay($this->level->getBlockAt($this->x, $this->y + 1, $this->z))) >= 0){
+				$newDecay = $topFlowDecay | 0x08;
+			}
+
+			if($this->adjacentSources >= 2 and $this instanceof Water){
 				$bottomBlock = $this->level->getBlockAt($this->x, $this->y - 1, $this->z);
-
-				$this->flowIntoBlock($bottomBlock, $decay | 0x08);
-
-				if($decay === 0 or !$bottomBlock->canBeFlowedInto()){
-					if($decay >= 8){
-						$adjacentDecay = 1;
-					}else{
-						$adjacentDecay = $decay + $multiplier;
-					}
-
-					if($adjacentDecay < 8){
-						$flags = $this->getOptimalFlowDirections();
-
-						if($flags[0]){
-							$this->flowIntoBlock($this->level->getBlockAt($this->x - 1, $this->y, $this->z), $adjacentDecay);
-						}
-
-						if($flags[1]){
-							$this->flowIntoBlock($this->level->getBlockAt($this->x + 1, $this->y, $this->z), $adjacentDecay);
-						}
-
-						if($flags[2]){
-							$this->flowIntoBlock($this->level->getBlockAt($this->x, $this->y, $this->z - 1), $adjacentDecay);
-						}
-
-						if($flags[3]){
-							$this->flowIntoBlock($this->level->getBlockAt($this->x, $this->y, $this->z + 1), $adjacentDecay);
-						}
-					}
+				if($bottomBlock->isSolid()){
+					$newDecay = 0;
+				}elseif($bottomBlock instanceof Water and $bottomBlock->getDamage() === 0){
+					$newDecay = 0;
 				}
-
-				$this->checkForHarden();
 			}
 
-			return $type;
+			if($newDecay !== $decay){
+				$decay = $newDecay;
+				if($decay < 0){
+					$this->level->setBlock($this, BlockFactory::get(Block::AIR), true, true);
+				}else{
+					$this->level->setBlock($this, BlockFactory::get($this->id, $decay), true, true);
+					$this->level->scheduleDelayedBlockUpdate($this, $this->tickRate());
+				}
+			}
 		}
 
-		return false;
+		if($decay >= 0){
+			$bottomBlock = $this->level->getBlockAt($this->x, $this->y - 1, $this->z);
+
+			$this->flowIntoBlock($bottomBlock, $decay | 0x08);
+
+			if($decay === 0 or !$bottomBlock->canBeFlowedInto()){
+				if($decay >= 8){
+					$adjacentDecay = 1;
+				}else{
+					$adjacentDecay = $decay + $multiplier;
+				}
+
+				if($adjacentDecay < 8){
+					$flags = $this->getOptimalFlowDirections();
+
+					if($flags[0]){
+						$this->flowIntoBlock($this->level->getBlockAt($this->x - 1, $this->y, $this->z), $adjacentDecay);
+					}
+
+					if($flags[1]){
+						$this->flowIntoBlock($this->level->getBlockAt($this->x + 1, $this->y, $this->z), $adjacentDecay);
+					}
+
+					if($flags[2]){
+						$this->flowIntoBlock($this->level->getBlockAt($this->x, $this->y, $this->z - 1), $adjacentDecay);
+					}
+
+					if($flags[3]){
+						$this->flowIntoBlock($this->level->getBlockAt($this->x, $this->y, $this->z + 1), $adjacentDecay);
+					}
+				}
+			}
+
+			$this->checkForHarden();
+		}
 	}
 
 	protected function flowIntoBlock(Block $block, int $newFlowDecay) : void{

src/pocketmine/block/Magma.php

@@ -66,4 +66,8 @@ class Magma extends Solid{
 			$entity->attack($ev);
 		}
 	}
+
+	public function burnsForever() : bool{
+		return true;
+	}
 }

src/pocketmine/block/MelonStem.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -42,45 +41,32 @@ class MelonStem extends Crops{
 		$this->meta = $meta;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) === 1){
-				if($this->meta < 0x07){
-					$block = clone $this;
-					++$block->meta;
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+	public function onRandomTick() : void{
+		if(mt_rand(0, 2) === 1){
+			if($this->meta < 0x07){
+				$block = clone $this;
+				++$block->meta;
+				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+				if(!$ev->isCancelled()){
+					$this->getLevel()->setBlock($this, $ev->getNewState(), true);
+				}
+			}else{
+				for($side = 2; $side <= 5; ++$side){
+					$b = $this->getSide($side);
+					if($b->getId() === self::MELON_BLOCK){
+						return;
+					}
+				}
+				$side = $this->getSide(mt_rand(2, 5));
+				$d = $side->getSide(Vector3::SIDE_DOWN);
+				if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, BlockFactory::get(Block::MELON_BLOCK)));
 					if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($this, $ev->getNewState(), true);
-					}
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}else{
-					for($side = 2; $side <= 5; ++$side){
-						$b = $this->getSide($side);
-						if($b->getId() === self::MELON_BLOCK){
-							return Level::BLOCK_UPDATE_RANDOM;
-						}
-					}
-					$side = $this->getSide(mt_rand(2, 5));
-					$d = $side->getSide(Vector3::SIDE_DOWN);
-					if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
-						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, BlockFactory::get(Block::MELON_BLOCK)));
-						if(!$ev->isCancelled()){
-							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
-						}
+						$this->getLevel()->setBlock($side, $ev->getNewState(), true);
 					}
 				}
 			}
-
-			return Level::BLOCK_UPDATE_RANDOM;
 		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/Mycelium.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -60,19 +59,17 @@ class Mycelium extends Solid{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_RANDOM){
-			//TODO: light levels
-			$x = mt_rand($this->x - 1, $this->x + 1);
-			$y = mt_rand($this->y - 2, $this->y + 2);
-			$z = mt_rand($this->z - 1, $this->z + 1);
-			$block = $this->getLevel()->getBlockAt($x, $y, $z);
-			if($block->getId() === Block::DIRT){
-				if($block->getSide(Vector3::SIDE_UP) instanceof Transparent){
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, BlockFactory::get(Block::MYCELIUM)));
-					if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($block, $ev->getNewState());
-					}
+	public function onRandomTick() : void{
+		//TODO: light levels
+		$x = mt_rand($this->x - 1, $this->x + 1);
+		$y = mt_rand($this->y - 2, $this->y + 2);
+		$z = mt_rand($this->z - 1, $this->z + 1);
+		$block = $this->getLevel()->getBlockAt($x, $y, $z);
+		if($block->getId() === Block::DIRT){
+			if($block->getSide(Vector3::SIDE_UP) instanceof Transparent){
+				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, BlockFactory::get(Block::MYCELIUM)));
+				if(!$ev->isCancelled()){
+					$this->getLevel()->setBlock($block, $ev->getNewState());
 				}
 			}
 		}

src/pocketmine/block/NetherWartPlant.php

@@ -27,7 +27,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -44,10 +43,6 @@ class NetherWartPlant extends Flowable{
 		return "Nether Wart";
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === Block::SOUL_SAND){
@@ -59,30 +54,26 @@ class NetherWartPlant extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		switch($type){
-			case Level::BLOCK_UPDATE_RANDOM:
-				if($this->meta < 3 and mt_rand(0, 10) === 0){ //Still growing
-					$block = clone $this;
-					$block->meta++;
-					$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
-
-					if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($this, $ev->getNewState(), false, true);
-
-						return $type;
-					}
-				}
-				break;
-			case Level::BLOCK_UPDATE_NORMAL:
-				if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::SOUL_SAND){
-					$this->getLevel()->useBreakOn($this);
-					return $type;
-				}
-				break;
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::SOUL_SAND){
+			$this->getLevel()->useBreakOn($this);
 		}
+	}
 
-		return false;
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if($this->meta < 3 and mt_rand(0, 10) === 0){ //Still growing
+			$block = clone $this;
+			$block->meta++;
+			$this->getLevel()->getServer()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+
+			if(!$ev->isCancelled()){
+				$this->getLevel()->setBlock($this, $ev->getNewState(), false, true);
+			}
+		}
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/Netherrack.php

@@ -48,4 +48,8 @@ class Netherrack extends Solid{
 	public function getToolHarvestLevel() : int{
 		return TieredTool::TIER_WOODEN;
 	}
+
+	public function burnsForever() : bool{
+		return true;
+	}
 }

src/pocketmine/block/Planks.php

@@ -61,4 +61,11 @@ class Planks extends Solid{
 		return 300;
 	}
 
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/PumpkinStem.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
 
@@ -42,45 +41,32 @@ class PumpkinStem extends Crops{
 		return "Pumpkin Stem";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== Block::FARMLAND){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) === 1){
-				if($this->meta < 0x07){
-					$block = clone $this;
-					++$block->meta;
-					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+	public function onRandomTick() : void{
+		if(mt_rand(0, 2) === 1){
+			if($this->meta < 0x07){
+				$block = clone $this;
+				++$block->meta;
+				Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+				if(!$ev->isCancelled()){
+					$this->getLevel()->setBlock($this, $ev->getNewState(), true);
+				}
+			}else{
+				for($side = 2; $side <= 5; ++$side){
+					$b = $this->getSide($side);
+					if($b->getId() === self::PUMPKIN){
+						return;
+					}
+				}
+				$side = $this->getSide(mt_rand(2, 5));
+				$d = $side->getSide(Vector3::SIDE_DOWN);
+				if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, BlockFactory::get(Block::PUMPKIN)));
 					if(!$ev->isCancelled()){
-						$this->getLevel()->setBlock($this, $ev->getNewState(), true);
-					}
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}else{
-					for($side = 2; $side <= 5; ++$side){
-						$b = $this->getSide($side);
-						if($b->getId() === self::PUMPKIN){
-							return Level::BLOCK_UPDATE_RANDOM;
-						}
-					}
-					$side = $this->getSide(mt_rand(2, 5));
-					$d = $side->getSide(Vector3::SIDE_DOWN);
-					if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){
-						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, BlockFactory::get(Block::PUMPKIN)));
-						if(!$ev->isCancelled()){
-							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
-						}
+						$this->getLevel()->setBlock($side, $ev->getNewState(), true);
 					}
 				}
 			}
-
-			return Level::BLOCK_UPDATE_RANDOM;
 		}
-
-		return false;
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/Rail.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -63,17 +62,12 @@ class Rail extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
-				$this->getLevel()->useBreakOn($this);
-				return $type;
-			}else{
-				//TODO: Update rail connectivity
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}else{
+			//TODO: Update rail connectivity
 		}
-
-		return false;
 	}
 
 	public function getVariantBitmask() : int{

src/pocketmine/block/RedMushroom.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -44,21 +43,15 @@ class RedMushroom extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
-		if($down->isTransparent() === false){
+		if(!$down->isTransparent()){
 			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 			return true;

src/pocketmine/block/RedstoneOre.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -50,14 +49,12 @@ class RedstoneOre extends Solid{
 		return $this->getLevel()->setBlock($this, $this, true, false);
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL or $type === Level::BLOCK_UPDATE_TOUCH){
-			$this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
+	public function onActivate(Item $item, Player $player = null) : bool{
+		return $this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
+	}
 
-			return Level::BLOCK_UPDATE_WEAK;
-		}
-
-		return false;
+	public function onNearbyBlockChange() : void{
+		$this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
 	}
 
 	public function getToolType() : int{

src/pocketmine/block/Sapling.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\generator\object\Tree;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\utils\Random;
@@ -56,10 +55,6 @@ class Sapling extends Flowable{
 		return $names[$this->getVariant()] ?? "Unknown";
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$down = $this->getSide(Vector3::SIDE_DOWN);
 		if($down->getId() === self::GRASS or $down->getId() === self::DIRT or $down->getId() === self::FARMLAND){
@@ -84,29 +79,25 @@ class Sapling extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){
-				$this->getLevel()->useBreakOn($this);
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
 
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){ //Growth
-			if(mt_rand(1, 7) === 1){
-				if(($this->meta & 0x08) === 0x08){
-					Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->getVariant());
-				}else{
-					$this->meta |= 0x08;
-					$this->getLevel()->setBlock($this, $this, true);
+	public function ticksRandomly() : bool{
+		return true;
+	}
 
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
+	public function onRandomTick() : void{
+		if(mt_rand(1, 7) === 1){
+			if(($this->meta & 0x08) === 0x08){
+				Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->getVariant());
 			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
+				$this->meta |= 0x08;
+				$this->getLevel()->setBlock($this, $this, true);
 			}
 		}
-
-		return false;
 	}
 
 	public function getVariantBitmask() : int{

src/pocketmine/block/SignPost.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -77,16 +76,10 @@ class SignPost extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function getToolType() : int{

src/pocketmine/block/SnowLayer.php

@@ -26,7 +26,6 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
 use pocketmine\item\TieredTool;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -58,10 +57,6 @@ class SnowLayer extends Flowable{
 		return TieredTool::TIER_WOODEN;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		if($blockReplace->getSide(Vector3::SIDE_DOWN)->isSolid()){
 			//TODO: fix placement
@@ -73,22 +68,20 @@ class SnowLayer extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid()){
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false, false);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->level->getBlockLightAt($this->x, $this->y, $this->z) >= 12){
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false, false);
-
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
+	public function onNearbyBlockChange() : void{
+		if(!$this->getSide(Vector3::SIDE_DOWN)->isSolid()){
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false, false);
 		}
+	}
 
-		return false;
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if($this->level->getBlockLightAt($this->x, $this->y, $this->z) >= 12){
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), false, false);
+		}
 	}
 
 	public function getDropsForCompatibleTool(Item $item) : array{

src/pocketmine/block/StandingBanner.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -75,16 +74,10 @@ class StandingBanner extends Transparent{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function getToolType() : int{
@@ -99,7 +92,7 @@ class StandingBanner extends Transparent{
 		$tile = $this->level->getTile($this);
 
 		$drop = ItemFactory::get(Item::BANNER, ($tile instanceof TileBanner ? $tile->getBaseColor() : 0));
-		if($tile instanceof TileBanner and ($patterns = $tile->namedtag->getListTag(TileBanner::TAG_PATTERNS)) !== null and $patterns->getCount() > 0){
+		if($tile instanceof TileBanner and ($patterns = $tile->namedtag->getListTag(TileBanner::TAG_PATTERNS)) !== null and !$patterns->empty()){
 			$drop->setNamedTagEntry($patterns);
 		}
 

src/pocketmine/block/Sugarcane.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -44,10 +43,6 @@ class Sugarcane extends Flowable{
 		return "Sugarcane";
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function onActivate(Item $item, Player $player = null) : bool{
 		if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
 			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){
@@ -73,36 +68,34 @@ class Sugarcane extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(Vector3::SIDE_DOWN);
-			if($down->isTransparent() === true and $down->getId() !== self::SUGARCANE_BLOCK){
-				$this->getLevel()->useBreakOn($this);
+	public function onNearbyBlockChange() : void{
+		$down = $this->getSide(Vector3::SIDE_DOWN);
+		if($down->isTransparent() and $down->getId() !== self::SUGARCANE_BLOCK){
+			$this->getLevel()->useBreakOn($this);
+		}
+	}
 
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){
-				if($this->meta === 0x0F){
-					for($y = 1; $y < 3; ++$y){
-						$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
-						if($b->getId() === self::AIR){
-							$this->getLevel()->setBlock($b, BlockFactory::get(Block::SUGARCANE_BLOCK), true);
-							break;
-						}
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){
+			if($this->meta === 0x0F){
+				for($y = 1; $y < 3; ++$y){
+					$b = $this->getLevel()->getBlockAt($this->x, $this->y + $y, $this->z);
+					if($b->getId() === self::AIR){
+						$this->getLevel()->setBlock($b, BlockFactory::get(Block::SUGARCANE_BLOCK), true);
+						break;
 					}
-					$this->meta = 0;
-					$this->getLevel()->setBlock($this, $this, true);
-				}else{
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true);
 				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
+				$this->meta = 0;
+				$this->getLevel()->setBlock($this, $this, true);
+			}else{
+				++$this->meta;
+				$this->getLevel()->setBlock($this, $this, true);
 			}
 		}
-
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{

src/pocketmine/block/TNT.php

@@ -68,4 +68,16 @@ class TNT extends Solid{
 			$tnt->spawnToAll();
 		}
 	}
+
+	public function getFlameEncouragement() : int{
+		return 15;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
+
+	public function onIncinerate() : void{
+		$this->ignite();
+	}
 }

src/pocketmine/block/TallGrass.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -61,17 +60,10 @@ class TallGrass extends Flowable{
 		return false;
 	}
 
-
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ //Replace with common break method
-				$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){ //Replace with common break method
+			$this->getLevel()->setBlock($this, BlockFactory::get(Block::AIR), true, true);
 		}
-
-		return false;
 	}
 
 	public function getToolType() : int{
@@ -96,4 +88,11 @@ class TallGrass extends Flowable{
 		return [];
 	}
 
+	public function getFlameEncouragement() : int{
+		return 60;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
 }

src/pocketmine/block/Torch.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 
@@ -44,34 +43,27 @@ class Torch extends Flowable{
 		return "Torch";
 	}
 
+	public function onNearbyBlockChange() : void{
+		$below = $this->getSide(Vector3::SIDE_DOWN);
+		$side = $this->getDamage();
+		$faces = [
+			0 => Vector3::SIDE_DOWN,
+			1 => Vector3::SIDE_WEST,
+			2 => Vector3::SIDE_EAST,
+			3 => Vector3::SIDE_NORTH,
+			4 => Vector3::SIDE_SOUTH,
+			5 => Vector3::SIDE_DOWN
+		];
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$below = $this->getSide(Vector3::SIDE_DOWN);
-			$side = $this->getDamage();
-			$faces = [
-				0 => Vector3::SIDE_DOWN,
-				1 => Vector3::SIDE_WEST,
-				2 => Vector3::SIDE_EAST,
-				3 => Vector3::SIDE_NORTH,
-				4 => Vector3::SIDE_SOUTH,
-				5 => Vector3::SIDE_DOWN
-			];
-
-			if($this->getSide($faces[$side])->isTransparent() === true and !($side === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
-				$this->getLevel()->useBreakOn($this);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+		if($this->getSide($faces[$side])->isTransparent() and !($side === Vector3::SIDE_DOWN and ($below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL))){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
 		$below = $this->getSide(Vector3::SIDE_DOWN);
 
-		if($blockClicked->isTransparent() === false and $face !== Vector3::SIDE_DOWN){
+		if(!$blockClicked->isTransparent() and $face !== Vector3::SIDE_DOWN){
 			$faces = [
 				Vector3::SIDE_UP => 5,
 				Vector3::SIDE_NORTH => 4,
@@ -83,7 +75,7 @@ class Torch extends Flowable{
 			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 
 			return true;
-		}elseif($below->isTransparent() === false or $below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL){
+		}elseif(!$below->isTransparent() or $below->getId() === self::FENCE or $below->getId() === self::COBBLESTONE_WALL){
 			$this->meta = 0;
 			$this->getLevel()->setBlock($blockReplace, $this, true, true);
 

src/pocketmine/block/Vine.php

@@ -25,7 +25,6 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -62,10 +61,6 @@ class Vine extends Flowable{
 		return true;
 	}
 
-	public function ticksRandomly() : bool{
-		return true;
-	}
-
 	public function canBeReplaced() : bool{
 		return true;
 	}
@@ -157,42 +152,42 @@ class Vine extends Flowable{
 		return true;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$sides = [
-				self::FLAG_SOUTH => Vector3::SIDE_SOUTH,
-				self::FLAG_WEST => Vector3::SIDE_WEST,
-				self::FLAG_NORTH => Vector3::SIDE_NORTH,
-				self::FLAG_EAST => Vector3::SIDE_EAST
-			];
+	public function onNearbyBlockChange() : void{
+		$sides = [
+			self::FLAG_SOUTH => Vector3::SIDE_SOUTH,
+			self::FLAG_WEST => Vector3::SIDE_WEST,
+			self::FLAG_NORTH => Vector3::SIDE_NORTH,
+			self::FLAG_EAST => Vector3::SIDE_EAST
+		];
 
-			$meta = $this->meta;
+		$meta = $this->meta;
 
-			foreach($sides as $flag => $side){
-				if(($meta & $flag) === 0){
-					continue;
-				}
-
-				if(!$this->getSide($side)->isSolid()){
-					$meta &= ~$flag;
-				}
+		foreach($sides as $flag => $side){
+			if(($meta & $flag) === 0){
+				continue;
 			}
 
-			if($meta !== $this->meta){
-				if($meta === 0){
-					$this->level->useBreakOn($this);
-				}else{
-					$this->meta = $meta;
-					$this->level->setBlock($this, $this);
-				}
-
-				return Level::BLOCK_UPDATE_NORMAL;
+			if(!$this->getSide($side)->isSolid()){
+				$meta &= ~$flag;
 			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			//TODO: vine growth
 		}
 
-		return false;
+		if($meta !== $this->meta){
+			if($meta === 0){
+				$this->level->useBreakOn($this);
+			}else{
+				$this->meta = $meta;
+				$this->level->setBlock($this, $this);
+			}
+		}
+	}
+
+	public function ticksRandomly() : bool{
+		return true;
+	}
+
+	public function onRandomTick() : void{
+		//TODO: vine growth
 	}
 
 	public function getVariantBitmask() : int{
@@ -210,4 +205,12 @@ class Vine extends Flowable{
 	public function getToolType() : int{
 		return BlockToolType::TYPE_AXE;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 15;
+	}
+
+	public function getFlammability() : int{
+		return 100;
+	}
 }

src/pocketmine/block/WallBanner.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
-
 class WallBanner extends StandingBanner{
 
 	protected $id = self::WALL_BANNER;
@@ -33,13 +31,9 @@ class WallBanner extends StandingBanner{
 		return "Wall Banner";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide($this->meta ^ 0x01)->getId() === self::AIR){
-				$this->getLevel()->useBreakOn($this);
-			}
-			return Level::BLOCK_UPDATE_NORMAL;
+	public function onNearbyBlockChange() : void{
+		if($this->getSide($this->meta ^ 0x01)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
 		}
-		return false;
 	}
 }

src/pocketmine/block/WallSign.php

@@ -23,8 +23,6 @@ declare(strict_types=1);
 
 namespace pocketmine\block;
 
-use pocketmine\level\Level;
-
 class WallSign extends SignPost{
 
 	protected $id = self::WALL_SIGN;
@@ -33,13 +31,9 @@ class WallSign extends SignPost{
 		return "Wall Sign";
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide($this->meta ^ 0x01)->getId() === self::AIR){
-				$this->getLevel()->useBreakOn($this);
-			}
-			return Level::BLOCK_UPDATE_NORMAL;
+	public function onNearbyBlockChange() : void{
+		if($this->getSide($this->meta ^ 0x01)->getId() === self::AIR){
+			$this->getLevel()->useBreakOn($this);
 		}
-		return false;
 	}
 }

src/pocketmine/block/WaterLily.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
@@ -69,15 +68,10 @@ class WaterLily extends Flowable{
 		return false;
 	}
 
-	public function onUpdate(int $type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if(!($this->getSide(Vector3::SIDE_DOWN) instanceof Water)){
-				$this->getLevel()->useBreakOn($this);
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
+	public function onNearbyBlockChange() : void{
+		if(!($this->getSide(Vector3::SIDE_DOWN) instanceof Water)){
+			$this->getLevel()->useBreakOn($this);
 		}
-
-		return false;
 	}
 
 	public function getVariantBitmask() : int{

src/pocketmine/block/Wood.php

@@ -70,4 +70,12 @@ class Wood extends Solid{
 	public function getFuelTime() : int{
 		return 300;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 5;
+	}
 }

src/pocketmine/block/WoodenFence.php

@@ -56,4 +56,12 @@ class WoodenFence extends Fence{
 	public function getFuelTime() : int{
 		return 300;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/WoodenSlab.php

@@ -54,4 +54,12 @@ class WoodenSlab extends Slab{
 	public function getFuelTime() : int{
 		return 300;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/WoodenStairs.php

@@ -36,4 +36,12 @@ class WoodenStairs extends Stair{
 	public function getToolType() : int{
 		return BlockToolType::TYPE_AXE;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 5;
+	}
+
+	public function getFlammability() : int{
+		return 20;
+	}
 }

src/pocketmine/block/Wool.php

@@ -54,4 +54,12 @@ class Wool extends Solid{
 
 		return $time;
 	}
+
+	public function getFlameEncouragement() : int{
+		return 30;
+	}
+
+	public function getFlammability() : int{
+		return 60;
+	}
 }

src/pocketmine/command/Command.php

@@ -26,18 +26,16 @@ declare(strict_types=1);
  */
 namespace pocketmine\command;
 
-use pocketmine\event\TextContainer;
-use pocketmine\event\TimingsHandler;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TextContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Server;
+use pocketmine\timings\TimingsHandler;
 use pocketmine\utils\TextFormat;
 
 abstract class Command{
 
 	/** @var string */
 	private $name;
-	/** @var array */
-	protected $commandData = null;
 
 	/** @var string */
 	private $nextLabel;
@@ -234,9 +232,9 @@ abstract class Command{
 	}
 
 	/**
-	 * @return string
+	 * @return string|null
 	 */
-	public function getPermissionMessage() : string{
+	public function getPermissionMessage() : ?string{
 		return $this->permissionMessage;
 	}
 
@@ -308,7 +306,7 @@ abstract class Command{
 			$colored = new TranslationContainer(TextFormat::GRAY . TextFormat::ITALIC . "%chat.type.admin", [$source->getName(), $message]);
 		}
 
-		if($sendToSource === true and !($source instanceof ConsoleCommandSender)){
+		if($sendToSource and !($source instanceof ConsoleCommandSender)){
 			$source->sendMessage($message);
 		}
 

src/pocketmine/command/CommandSender.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-use pocketmine\event\TextContainer;
+use pocketmine\lang\TextContainer;
 use pocketmine\permission\Permissible;
 use pocketmine\Server;
 

src/pocketmine/command/ConsoleCommandSender.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-use pocketmine\event\TextContainer;
+use pocketmine\lang\TextContainer;
 use pocketmine\permission\PermissibleBase;
 use pocketmine\permission\Permission;
 use pocketmine\permission\PermissionAttachment;
@@ -92,13 +92,6 @@ class ConsoleCommandSender implements CommandSender{
 		return $this->perm->getEffectivePermissions();
 	}
 
-	/**
-	 * @return bool
-	 */
-	public function isPlayer() : bool{
-		return false;
-	}
-
 	/**
 	 * @return Server
 	 */

src/pocketmine/command/FormattedCommandAlias.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Server;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/RemoteConsoleCommandSender.php

@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
-use pocketmine\event\TextContainer;
+use pocketmine\lang\TextContainer;
 
 class RemoteConsoleCommandSender extends ConsoleCommandSender{
 

src/pocketmine/command/SimpleCommandMap.php

@@ -65,7 +65,7 @@ use pocketmine\command\defaults\VanillaCommand;
 use pocketmine\command\defaults\VersionCommand;
 use pocketmine\command\defaults\WhitelistCommand;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Server;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/defaults/BanCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 
 class BanCommand extends VanillaCommand{

src/pocketmine/command/defaults/BanIpCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 
 class BanIpCommand extends VanillaCommand{

src/pocketmine/command/defaults/BanListCommand.php

@@ -25,7 +25,7 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\permission\BanEntry;
 
 class BanListCommand extends VanillaCommand{

src/pocketmine/command/defaults/DefaultGamemodeCommand.php

@@ -25,7 +25,7 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Server;
 
 class DefaultGamemodeCommand extends VanillaCommand{

src/pocketmine/command/defaults/DeopCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/defaults/DifficultyCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\level\Level;
 
 class DifficultyCommand extends VanillaCommand{

src/pocketmine/command/defaults/DumpMemoryCommand.php

@@ -27,13 +27,11 @@ use pocketmine\command\CommandSender;
 
 class DumpMemoryCommand extends VanillaCommand{
 
-	private static $executions = 0;
-
 	public function __construct(string $name){
 		parent::__construct(
 			$name,
 			"Dumps the memory",
-			"/$name <TOKEN (run once to get it)> [path]"
+			"/$name [path]"
 		);
 		$this->setPermission("pocketmine.command.dumpmemory");
 	}
@@ -43,16 +41,7 @@ class DumpMemoryCommand extends VanillaCommand{
 			return true;
 		}
 
-		$token = strtoupper(substr(sha1(BOOTUP_RANDOM . ":" . $sender->getServer()->getServerUniqueId() . ":" . self::$executions), 6, 6));
-
-		if(count($args) < 1 or strtoupper($args[0]) !== $token){
-			$sender->sendMessage("Usage: /" . $this->getName() . " " . $token);
-			return true;
-		}
-
-		++self::$executions;
-
-		$sender->getServer()->getMemoryManager()->dumpServerMemory($args[1] ?? ($sender->getServer()->getDataPath() . "/memoryDump_$token"), 48, 80);
+		$sender->getServer()->getMemoryManager()->dumpServerMemory($args[0] ?? ($sender->getServer()->getDataPath() . "/memory_dumps/" . date("D_M_j-H.i.s-T_Y")), 48, 80);
 		return true;
 	}
 }

src/pocketmine/command/defaults/EffectCommand.php

@@ -26,7 +26,8 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\entity\Effect;
-use pocketmine\event\TranslationContainer;
+use pocketmine\entity\EffectInstance;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 class EffectCommand extends VanillaCommand{
@@ -79,26 +80,26 @@ class EffectCommand extends VanillaCommand{
 		$amplification = 0;
 
 		if(count($args) >= 3){
-			$duration = ((int) $args[2]) * 20; //ticks
+			if(($d = $this->getBoundedInt($sender, $args[2], 0, INT32_MAX)) === null){
+				return false;
+			}
+			$duration = $d * 20; //ticks
 		}else{
-			$duration = $effect->getDefaultDuration();
+			$duration = null;
 		}
 
 		if(count($args) >= 4){
-			$amplification = (int) $args[3];
-			if($amplification > 255){
-				$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.num.tooBig", [(string) $args[3], "255"]));
-				return true;
-			}elseif($amplification < 0){
-				$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.num.tooSmall", [(string) $args[3], "0"]));
-				return true;
+			$amplification = $this->getBoundedInt($sender, $args[3], 0, 255);
+			if($amplification === null){
+				return false;
 			}
 		}
 
+		$visible = true;
 		if(count($args) >= 5){
 			$v = strtolower($args[4]);
 			if($v === "on" or $v === "true" or $v === "t" or $v === "1"){
-				$effect->setVisible(false);
+				$visible = false;
 			}
 		}
 
@@ -115,10 +116,9 @@ class EffectCommand extends VanillaCommand{
 			$player->removeEffect($effect->getId());
 			$sender->sendMessage(new TranslationContainer("commands.effect.success.removed", [$effect->getName(), $player->getDisplayName()]));
 		}else{
-			$effect->setDuration($duration)->setAmplifier($amplification);
-
-			$player->addEffect($effect);
-			self::broadcastCommandMessage($sender, new TranslationContainer("%commands.effect.success", [$effect->getName(), $effect->getAmplifier(), $player->getDisplayName(), $effect->getDuration() / 20, $effect->getId()]));
+			$instance = new EffectInstance($effect, $duration, $amplification, $visible);
+			$player->addEffect($instance);
+			self::broadcastCommandMessage($sender, new TranslationContainer("%commands.effect.success", [$effect->getName(), $instance->getAmplifier(), $player->getDisplayName(), $instance->getDuration() / 20, $effect->getId()]));
 		}
 
 

src/pocketmine/command/defaults/EnchantCommand.php

@@ -25,9 +25,9 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
 use pocketmine\item\enchantment\Enchantment;
 use pocketmine\item\enchantment\EnchantmentInstance;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 class EnchantCommand extends VanillaCommand{

src/pocketmine/command/defaults/GamemodeCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 use pocketmine\Server;
 use pocketmine\utils\TextFormat;

src/pocketmine/command/defaults/GiveCommand.php

@@ -26,11 +26,10 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
 use pocketmine\item\ItemFactory;
-use pocketmine\nbt\JsonNBTParser;
+use pocketmine\lang\TranslationContainer;
+use pocketmine\nbt\JsonNbtParser;
 use pocketmine\nbt\tag\CompoundTag;
-use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 
 class GiveCommand extends VanillaCommand{
@@ -54,7 +53,17 @@ class GiveCommand extends VanillaCommand{
 		}
 
 		$player = $sender->getServer()->getPlayer($args[0]);
-		$item = ItemFactory::fromString($args[1]);
+		if($player === null){
+			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound"));
+			return true;
+		}
+
+		try{
+			$item = ItemFactory::fromString($args[1]);
+		}catch(\InvalidArgumentException $e){
+			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.give.item.notFound", [$args[1]]));
+			return true;
+		}
 
 		if(!isset($args[2])){
 			$item->setCount($item->getMaxStackSize());
@@ -66,8 +75,8 @@ class GiveCommand extends VanillaCommand{
 			$tags = $exception = null;
 			$data = implode(" ", array_slice($args, 3));
 			try{
-				$tags = JsonNBTParser::parseJSON($data);
-			}catch(\Throwable $ex){
+				$tags = JsonNbtParser::parseJson($data);
+			}catch(\Exception $ex){
 				$exception = $ex;
 			}
 
@@ -79,20 +88,8 @@ class GiveCommand extends VanillaCommand{
 			$item->setNamedTag($tags);
 		}
 
-		if($player instanceof Player){
-			if($item->getId() === 0){
-				$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.give.item.notFound", [$args[1]]));
-
-				return true;
-			}
-
-			//TODO: overflow
-			$player->getInventory()->addItem(clone $item);
-		}else{
-			$sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound"));
-
-			return true;
-		}
+		//TODO: overflow
+		$player->getInventory()->addItem(clone $item);
 
 		Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.give.success", [
 			$item->getName() . " (" . $item->getId() . ":" . $item->getDamage() . ")",

src/pocketmine/command/defaults/HelpCommand.php

@@ -25,7 +25,7 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 class HelpCommand extends VanillaCommand{

src/pocketmine/command/defaults/KickCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/defaults/KillCommand.php

@@ -27,7 +27,7 @@ use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/defaults/ListCommand.php

@@ -24,7 +24,7 @@ declare(strict_types=1);
 namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 
 class ListCommand extends VanillaCommand{

src/pocketmine/command/defaults/MeCommand.php

@@ -25,7 +25,7 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/defaults/OpCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 

src/pocketmine/command/defaults/PardonCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 
 class PardonCommand extends VanillaCommand{
 

src/pocketmine/command/defaults/PardonIpCommand.php

@@ -26,7 +26,7 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
+use pocketmine\lang\TranslationContainer;
 
 class PardonIpCommand extends VanillaCommand{
 

src/pocketmine/command/defaults/ParticleCommand.php

@@ -26,9 +26,9 @@ namespace pocketmine\command\defaults;
 use pocketmine\block\BlockFactory;
 use pocketmine\command\CommandSender;
 use pocketmine\command\utils\InvalidCommandSyntaxException;
-use pocketmine\event\TranslationContainer;
 use pocketmine\item\Item;
 use pocketmine\item\ItemFactory;
+use pocketmine\lang\TranslationContainer;
 use pocketmine\level\particle\AngryVillagerParticle;
 use pocketmine\level\particle\BlockForceFieldParticle;
 use pocketmine\level\particle\BubbleParticle;