Merge pull request #127 from dmulloy2/master

Branch hiccup

modules/API/src/main/java/com/comphenix/protocol/utility/Util.java

@@ -63,10 +63,14 @@ public class Util {
 
 	/**
 	 * Gets the currently running major Java version.
-	 * @return The version
+	 * @return The version or -1 if it could not be found
 	 */
 	public static int getJavaVersion() {
+		try {
 			String version = Runtime.class.getPackage().getSpecificationVersion();
-		return (int) (Double.valueOf(version) * 10 % 10);
+			return (int) (Double.parseDouble(version) * 10 % 10);
+		} catch (Throwable ex) {
+			return -1;
+		}
 	}
 }

modules/ProtocolLib/src/main/java/com/comphenix/protocol/PacketLogging.java

@@ -16,6 +16,7 @@
  */
 package com.comphenix.protocol;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.text.MessageFormat;
@@ -29,6 +30,7 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
+import org.apache.commons.io.HexDump;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -41,9 +43,7 @@ import com.comphenix.protocol.events.ListeningWhitelist;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.netty.WirePacket;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufUtil;
+import com.google.common.base.Charsets;
 
 /**
  * Logs packets to a given stream
@@ -73,6 +73,7 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 	public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
 		PacketType type = null;
 
+		try {
 			if (args.length > 2) {
 				Protocol protocol;
 
@@ -97,10 +98,28 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 						int id = Integer.parseInt(args[2]);
 						type = PacketType.findCurrent(protocol, pSender, id);
 					} catch (NumberFormatException ex) {
-					type = PacketType.findCurrent(protocol, pSender, args[2]);
+						String name = args[2];
+						outer: for (PacketType packet : PacketType.values()) {
+							if (packet.getProtocol() == protocol && packet.getSender() == pSender) {
+								if (packet.name().equalsIgnoreCase(name)) {
+									type = packet;
+									break outer;
+								}
+								for (String className : packet.getClassNames()) {
+									if (className.equalsIgnoreCase(name)) {
+										type = packet;
+										break outer;
+									}
+								}
+							}
+						}
 					}
 				} catch (IllegalArgumentException ex) {
-				sender.sendMessage(ChatColor.RED + "Unknown packet: " + PacketType.format(protocol, pSender, args[2]));
+					type = null;
+				}
+
+				if (type == null) {
+					sender.sendMessage(ChatColor.RED + "Unknown packet: " + args[2]);
 					return true;
 				}
 
@@ -133,6 +152,10 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 
 			sender.sendMessage(ChatColor.RED + "Invalid syntax: /packetlog <protocol> <sender> <packet> [location]");
 			return true;
+		} catch (Throwable ex) {
+			sender.sendMessage(ChatColor.RED + "Failed to parse command: " + ex.toString());
+			return true;
+		}
 	}
 
 	private void startLogging() {
@@ -176,9 +199,17 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 		log(event);
 	}
 
+	private static String hexDump(byte[] bytes) throws IOException {
+		try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+			HexDump.dump(bytes, 0, output, 0);
+			return new String(output.toByteArray(), Charsets.UTF_8);
+		}
+	}
+
 	private void log(PacketEvent event) {
-		ByteBuf buffer = WirePacket.bufferFromPacket(event.getPacket());
-		String hexDump = ByteBufUtil.hexDump(buffer);
+		try {
+			WirePacket packet = WirePacket.fromPacket(event.getPacket());
+			String hexDump = hexDump(packet.getBytes());
 
 			if (location == LogLocation.FILE) {
 				fileLogger.log(Level.INFO, event.getPacketType() + ":");
@@ -189,6 +220,14 @@ public class PacketLogging implements CommandExecutor, PacketListener {
 				System.out.println(hexDump);
 				System.out.println();
 			}
+		} catch (Throwable ex) {
+			plugin.getLogger().log(Level.WARNING, "Failed to log packet " + event.getPacketType() + ":", ex);
+			plugin.getLogger().log(Level.WARNING, "Clearing packet logger...");
+
+			sendingTypes.clear();
+			receivingTypes.clear();
+			startLogging();
+		}
 	}
 
 	@Override

modules/ProtocolLib/src/main/java/com/comphenix/protocol/ProtocolLib.java

@@ -156,7 +156,7 @@ public class ProtocolLib extends JavaPlugin {
 		ProtocolLogger.init(this);
 
 		int java = Util.getJavaVersion();
-		if (java < 8 && !getConfig().getBoolean("ignoreJava", false)) {
+		if (java != -1 && java < 8 && !getConfig().getBoolean("ignoreJava", false)) {
 			logger.warning("Detected outdated Java version: Java " + java);
 			logger.warning("It is recommended that you update to Java 8 as soon as possible.");
 			logger.warning("Future versions of ProtocolLib many not support Java " + java + ".");