From de5ecfcb933eff5514c90311bf3586aa6bbcc7c7 Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Mon, 5 Oct 2015 22:28:31 +0200
Subject: [PATCH] Fix compatibility issues

---
 pom.xml                                                | 10 ++++++++++
 src/main/java/fr/xephi/authme/AuthMe.java              |  3 +--
 .../xephi/authme/listener/AuthMeInventoryListener.java |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 86fe315e..cca09242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,7 @@
 							<include>com.sun.mail:javax.mail</include>
 							<include>com.comphenix.attribute:AttributeStorage</include>
 							<include>org.mcstats.bukkit:metrics</include>
+							<include>com.google.code.gson:gson</include>
 						</includes>
 					</artifactSet>
 					<relocations>
@@ -241,6 +242,15 @@
 			<optional>true</optional>
 		</dependency>
 
+		<!-- GSON required for 1.7.X compatibility -->
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.4</version>
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+
 
 		<!-- Maxmind GeoIp API -->
 		<dependency>
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index dcff35fd..086e16ec 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -24,7 +24,6 @@ import org.bukkit.scheduler.BukkitTask;
 import org.apache.logging.log4j.LogManager;
 
 import org.mcstats.Metrics;
-import com.comphenix.protocol.ProtocolLibrary;
 import com.earth2me.essentials.Essentials;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import net.milkbowl.vault.permission.Permission;
@@ -474,7 +473,7 @@ public class AuthMe extends JavaPlugin {
         if (Settings.protectInventoryBeforeLogInEnabled) {
             if (server.getPluginManager().isPluginEnabled("ProtocolLib")) {
                 inventoryProtector = new AuthMeInventoryListener(this);
-                ProtocolLibrary.getProtocolManager().addPacketListener(inventoryProtector);
+                inventoryProtector.register();
             } else {
                 ConsoleLogger.showError("WARNING!!! The protectInventory feature requires ProtocolLib! Disabling it...");
                 Settings.protectInventoryBeforeLogInEnabled = false;
diff --git a/src/main/java/fr/xephi/authme/listener/AuthMeInventoryListener.java b/src/main/java/fr/xephi/authme/listener/AuthMeInventoryListener.java
index 9b59a148..bbaafbfa 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMeInventoryListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMeInventoryListener.java
@@ -60,6 +60,10 @@ public class AuthMeInventoryListener extends PacketAdapter {
         }
     }
 
+    public void register() {
+        ProtocolLibrary.getProtocolManager().addPacketListener(this);
+    }
+
     public void sendInventoryPacket(Player player) {
         ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
         PacketContainer inventoryPacket = protocolManager.createPacket(PacketType.Play.Server.WINDOW_ITEMS);