NetherPortal: bugfix
Merge branch 'dev' into NetherPortal-dev

* dev:
  Goto: Bug fixes
NetherPortal: Bugfixes
Merge branch 'NetherPortal-dev' into dev

* NetherPortal-dev:
  NetherPortal: Bugfixes
  NetherPortal: bugfix