From d127704022262baac724669382f0e627aee9c277 Mon Sep 17 00:00:00 2001
From: Romain Beaumont <romain.rom1@gmail.com>
Date: Sun, 27 May 2018 13:50:27 +0200
Subject: [PATCH] Several fixes

* fix login sequence : fix spawn position
* fix gamemode != 0 : should not remove items from inventory
* update pworld and pprovider-anvil
---
 package.json                  | 4 ++--
 src/lib/plugins/login.js      | 4 ++--
 src/lib/plugins/placeBlock.js | 2 +-
 src/lib/plugins/spawn.js      | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2b7a958..8376332 100644
--- a/package.json
+++ b/package.json
@@ -35,9 +35,9 @@
     "prismarine-chunk": "^1.9.0",
     "prismarine-entity": "^0.2.0",
     "prismarine-item": "^1.0.1",
-    "prismarine-provider-anvil": "^2.0.0",
+    "prismarine-provider-anvil": "^2.1.0",
     "prismarine-windows": "^1.0.1",
-    "prismarine-world": "^2.0.0",
+    "prismarine-world": "^2.1.0",
     "random-seed": "^0.3.0",
     "range": "^0.0.3",
     "request": "^2.83.0",
diff --git a/src/lib/plugins/login.js b/src/lib/plugins/login.js
index c68e282..e126809 100644
--- a/src/lib/plugins/login.js
+++ b/src/lib/plugins/login.js
@@ -152,11 +152,11 @@ module.exports.player = function (player, serv, settings) {
     addPlayer()
     await player.findSpawnPoint()
     sendLogin()
-    await player.sendMap()
     player.sendSpawnPosition()
     player.sendSelfPosition()
-    player.updateHealth(player.health)
     player.sendAbilities()
+    await player.sendMap()
+    player.updateHealth(player.health)
 
     updateTime()
     fillTabList()
diff --git a/src/lib/plugins/placeBlock.js b/src/lib/plugins/placeBlock.js
index 0cd0575..3436b30 100644
--- a/src/lib/plugins/placeBlock.js
+++ b/src/lib/plugins/placeBlock.js
@@ -35,7 +35,7 @@ module.exports.player = function (player, serv, {version}) {
         })
       }
 
-      player.inventory.slots[36 + player.heldItemSlot]--
+      if (player.gameMode === 0) { player.inventory.slots[36 + player.heldItemSlot]-- }
 
       if (heldItem.type !== 323) {
         player.changeBlock(position, id, damage)
diff --git a/src/lib/plugins/spawn.js b/src/lib/plugins/spawn.js
index 46e49df..9abebaf 100644
--- a/src/lib/plugins/spawn.js
+++ b/src/lib/plugins/spawn.js
@@ -160,6 +160,7 @@ module.exports.player = function (player, serv, options) {
             velocity: Vec3((Math.random() - 0.5) * 10, Math.random() * 10 + 10, (Math.random() - 0.5) * 10)
           })
         }
+        return entity
       })
         .reduce((prec, entity) => {
           if (prec !== null) { prec.attach(entity) }