From 2f341029a6f4817daf0cc5672ef6c9d06eed8a54 Mon Sep 17 00:00:00 2001
From: games647 <games@tsprivat.de>
Date: Tue, 28 Jun 2016 11:22:30 +0200
Subject: [PATCH] Use bukkit's updateInventory method for restoring NBT data

---
 .../AuthMeInventoryPacketAdapter.java         | 45 +------------------
 .../process/login/ProcessSyncPlayerLogin.java |  4 +-
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/protocollib/AuthMeInventoryPacketAdapter.java b/src/main/java/fr/xephi/authme/listener/protocollib/AuthMeInventoryPacketAdapter.java
index a8179b74..980f3ccb 100644
--- a/src/main/java/fr/xephi/authme/listener/protocollib/AuthMeInventoryPacketAdapter.java
+++ b/src/main/java/fr/xephi/authme/listener/protocollib/AuthMeInventoryPacketAdapter.java
@@ -33,7 +33,6 @@ import org.bukkit.inventory.PlayerInventory;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.logging.Level;
 
 public class AuthMeInventoryPacketAdapter extends PacketAdapter {
@@ -75,49 +74,7 @@ public class AuthMeInventoryPacketAdapter extends PacketAdapter {
     }
 
     public void sendInventoryPacket(Player player) {
-        ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
-        PacketContainer inventoryPacket = protocolManager.createPacket(PacketType.Play.Server.WINDOW_ITEMS);
-
-        // we are sending our own inventory
-        inventoryPacket.getIntegers().write(0, PLAYER_INVENTORY);
-
-        ItemStack[] playerCrafting = new ItemStack[CRAFTING_SIZE];
-        Arrays.fill(playerCrafting, new ItemStack(Material.AIR));
-        ItemStack[] armorContents = player.getInventory().getArmorContents();
-        ItemStack[] mainInventory = player.getInventory().getContents();
-
-        // bukkit saves the armor in reversed order
-        Collections.reverse(Arrays.asList(armorContents));
-
-        // same main inventory. The hotbar is at the beginning but it should be at the end of the array
-        ItemStack[] hotbar = Arrays.copyOfRange(mainInventory, 0, HOTBAR_SIZE);
-        ItemStack[] storedInventory = Arrays.copyOfRange(mainInventory, HOTBAR_SIZE, mainInventory.length);
-
-        // concat all parts of the inventory together
-        int inventorySize = CRAFTING_SIZE + ARMOR_SIZE + MAIN_SIZE + HOTBAR_SIZE;
-        if (offHandSupported) {
-            inventorySize++;
-        }
-
-        ItemStack[] completeInventory = new ItemStack[inventorySize];
-
-        System.arraycopy(playerCrafting, 0, completeInventory, 0, CRAFTING_SIZE);
-        System.arraycopy(armorContents, 0, completeInventory, CRAFTING_SIZE, ARMOR_SIZE);
-
-        // storedInventory and hotbar
-        System.arraycopy(storedInventory, 0, completeInventory, CRAFTING_SIZE + ARMOR_SIZE, MAIN_SIZE);
-        System.arraycopy(hotbar, 0, completeInventory, CRAFTING_SIZE + ARMOR_SIZE + MAIN_SIZE, HOTBAR_SIZE);
-
-        if (offHandSupported) {
-            completeInventory[OFF_HAND_POSITION] = player.getInventory().getItemInOffHand();
-        }
-
-        inventoryPacket.getItemArrayModifier().write(0, completeInventory);
-        try {
-            protocolManager.sendServerPacket(player, inventoryPacket, false);
-        } catch (InvocationTargetException invocationExc) {
-            plugin.getLogger().log(Level.WARNING, "Error during inventory recovery", invocationExc);
-        }
+        player.updateInventory();
     }
 
     public void sendBlankInventoryPacket(Player player) {
diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
index 14a4f8e0..783a4ed3 100644
--- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
@@ -2,6 +2,7 @@ package fr.xephi.authme.process.login;
 
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
+
 import fr.xephi.authme.AuthMe;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.limbo.LimboCache;
@@ -19,6 +20,7 @@ import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.util.BukkitService;
 import fr.xephi.authme.util.TeleportationService;
+
 import org.apache.commons.lang.reflect.MethodUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.LivingEntity;
@@ -75,7 +77,7 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
         RestoreInventoryEvent event = new RestoreInventoryEvent(player);
         pluginManager.callEvent(event);
         if (!event.isCancelled()) {
-            player.updateInventory();
+            protocolLibService.sendInventoryPacket(player);
         }
     }