From 1699a7fa3a1c44734005c9e6add2e3abb16b0fdd Mon Sep 17 00:00:00 2001
From: cnaude <cnaude@zebra>
Date: Fri, 22 May 2015 21:19:29 -0700
Subject: [PATCH] Minecraft 1.8.5 compatibility.

---
 dependency-reduced-pom.xml                                | 6 ++++++
 pom.xml                                                   | 8 ++++++++
 .../{NetPacket_184.java => NetPacket_184_185.java}        | 2 +-
 .../java/com/cnaude/purpleirc/Utilities/NetPackets.java   | 6 +++---
 4 files changed, 18 insertions(+), 4 deletions(-)
 rename src/main/java/com/cnaude/purpleirc/Utilities/{NetPacket_184.java => NetPacket_184_185.java} (96%)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index b9be69c..6f68dc3 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -148,6 +148,12 @@
       <version>1.8.4</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>spigot-185</artifactId>
+      <version>1.8.5</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
diff --git a/pom.xml b/pom.xml
index 6d8ed86..a6b007c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,6 +93,14 @@
             <scope>provided</scope>
         </dependency>
         
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>spigot-185</artifactId>
+            <version>1.8.5</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        
         <!-- PircBotX -->
         <dependency>
             <groupId>com.cnaude.pircbotx</groupId>
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java
similarity index 96%
rename from src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184.java
rename to src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java
index 50c39f8..d3a0f4d 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java
@@ -30,7 +30,7 @@ import net.minecraft.server.v1_8_R3.PlayerInteractManager;
  *
  * @author cnaude
  */
-public class NetPacket_184 {
+public class NetPacket_184_185 {
 
     public static PacketContainer add(String displayName) {
         UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
index c626ce1..7fcac65 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -135,13 +135,13 @@ public class NetPackets {
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());
             }
-        } else if (version.contains("MC: 1.8.4")) {
+        } else if (version.contains("MC: 1.8.4") || version.contains("MC: 1.8.5")) {
             try {
                 if (add) {
-                    return NetPacket_184.add(displayName);
+                    return NetPacket_184_185.add(displayName);
                 } else {
                     plugin.logDebug("T: Removing: " + name);
-                    return NetPacket_184.rem(displayName);
+                    return NetPacket_184_185.rem(displayName);
                 }
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());