From 355d00d951e63fadba7b864145d6f058794de5b6 Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Fri, 13 May 2016 17:12:21 -0400 Subject: [PATCH] Complete 1.9.4 update Fixes #204 --- .../main/java/com/comphenix/protocol/ProtocolLibrary.java | 6 +++--- .../protocol/utility/MinecraftProtocolVersion.java | 1 + .../comphenix/protocol/injector/player/PlayerInjector.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java b/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java index 5f84456c..d080d56c 100644 --- a/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java +++ b/modules/API/src/main/java/com/comphenix/protocol/ProtocolLibrary.java @@ -39,12 +39,12 @@ public class ProtocolLibrary { /** * The maximum version ProtocolLib has been tested with. */ - public static final String MAXIMUM_MINECRAFT_VERSION = "1.9.2"; + public static final String MAXIMUM_MINECRAFT_VERSION = "1.9.4"; /** - * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.9) was released. + * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version (1.9.4) was released. */ - public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-02-29"; + public static final String MINECRAFT_LAST_RELEASE_DATE = "2016-05-10"; /** * Plugins that are currently incompatible with ProtocolLib. diff --git a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java b/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java index ce51b3e5..5120b1df 100644 --- a/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java +++ b/modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftProtocolVersion.java @@ -41,6 +41,7 @@ public class MinecraftProtocolVersion { map.put(new MinecraftVersion(1, 8, 0), 47); map.put(new MinecraftVersion(1, 9, 0), 107); map.put(new MinecraftVersion(1, 9, 2), 109); + map.put(new MinecraftVersion(1, 9, 4), 110); return map; } diff --git a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java b/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java index 698ed74c..3c9879c1 100644 --- a/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java +++ b/modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java @@ -591,7 +591,7 @@ public abstract class PlayerInjector implements SocketInjector { * @param packet - packet to sent. * @return The given packet, or the packet replaced by the listeners. */ - @SuppressWarnings("deprecation") + @SuppressWarnings({ "deprecation", "null" }) public Object handlePacketSending(Object packet) { try { // Get the packet ID too