Add ProtocolLib support for MC 1.8

cnaude · Dec 10, 2014 · 2a445f2 · 2a445f2
1 parent 6cc288d
commit 2a445f2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -131,8 +131,8 @@
   <dependencies>
     <dependency>
       <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.7.9-R0.1</version>
+      <artifactId>spigot-api</artifactId>
+      <version>1.8</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -311,7 +311,7 @@
   <properties>
     <build.number>SNAPSHOT</build.number>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.7.9-R0.1</bukkit.version>
+    <bukkit.version>1.8</bukkit.version>
   </properties>
 </project>
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Bukkit API Version, change if out dated -->
-        <bukkit.version>1.7.9-R0.1</bukkit.version>
+        <bukkit.version>1.8</bukkit.version>
         <build.number>SNAPSHOT</build.number>
     </properties>
 
@@ -69,7 +69,7 @@
     <dependencies>
         <dependency>
             <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
+            <artifactId>spigot-api</artifactId>
             <version>${bukkit.version}</version>
             <type>jar</type>
             <scope>provided</scope>

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -102,29 +102,34 @@ public void remFromTabList(String name) {
 
     private PacketContainer tabPacket(String name, boolean add) {
         String displayName = truncateName(plugin.customTabPrefix + name);
-        PacketContainer packet;
+        PacketContainer packet = null;
         String version = plugin.getServer().getVersion();
+        plugin.logDebug("tabPacket: " + version);
         if (version.contains("MC: 1.7.10") || version.contains("MC: 1.8")) {
-            plugin.logDebug("tabPacket: " + version);
-            packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
-            packet.getIntegers().write(0, (add ? 0 : 4));
-            packet.getGameProfiles().write(0, new WrappedGameProfile(java.util.UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)), displayName));
-            packet.getIntegers().write(1, 0);
-            packet.getIntegers().write(2, 0);
-            packet.getStrings().write(0, displayName);
+            try {
+                packet = protocolManager.createPacket(PacketType.Play.Server.PLAYER_INFO);
+                packet.getIntegers().write(0, (add ? 0 : 4));
+                packet.getGameProfiles().write(0, new WrappedGameProfile(java.util.UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8)), displayName));
+                packet.getIntegers().write(1, 0);
+                packet.getIntegers().write(2, 0);
+                packet.getStrings().write(0, displayName);
+            } catch (Exception ex) {
+                plugin.logError("tabPacket: " + ex.getMessage());                
+            }
         } else {
-            plugin.logDebug("tabPacket: deprecated " + version);
+            plugin.logDebug("tabPacket: deprecated ");
             playerListConstructor = protocolManager.createPacketConstructor(Packets.Server.PLAYER_INFO, "", false, (int) 0);
             packet = playerListConstructor.createPacket(displayName, add, 0);
         }
         return packet;
     }
-        /**
-         *
-         * @param player
-         * @param ircBot
-         * @param channel
-         */
+
+    /**
+     *
+     * @param player
+     * @param ircBot
+     * @param channel
+     */
     public void updateTabList(Player player, final PurpleBot ircBot, final Channel channel) {
         plugin.getServer().getScheduler().runTaskLater(plugin, new Runnable() {
             @Override