From bfa0eee91e409ab3f1c2d8b08fcb3d41d7a88d77 Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Sun, 3 May 2020 15:59:55 -0400 Subject: [PATCH] Fix direction and dimension enums --- .../com/comphenix/protocol/wrappers/BukkitConverters.java | 7 +++---- .../java/com/comphenix/protocol/wrappers/EnumWrappers.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java b/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java index 79e85e6d..7ed4e1fa 100644 --- a/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java +++ b/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java @@ -1133,8 +1133,7 @@ public class BukkitConverters { private static MethodAccessor idFromDimension = null; public static EquivalentConverter getDimensionIDConverter() { - return new EquivalentConverter() { - + return ignoreNull(new EquivalentConverter() { @Override public Object getGeneric(Integer specific) { if (dimensionFromId == null) { @@ -1149,7 +1148,7 @@ public class BukkitConverters { dimensionFromId = Accessors.getMethodAccessor(reflection.getMethod(contract)); } - return dimensionFromId.invoke(null, (int) specific); + return dimensionFromId.invoke(null, specific); } @Override @@ -1173,6 +1172,6 @@ public class BukkitConverters { public Class getSpecificType() { return Integer.class; } - }; + }); } } diff --git a/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java b/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java index 712cab88..636c9f39 100644 --- a/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java +++ b/src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java @@ -422,7 +422,7 @@ public abstract class EnumWrappers { SOUND_CATEGORY_CLASS = getEnum(PacketType.Play.Server.CUSTOM_SOUND_EFFECT.getPacketClass(), 0); ITEM_SLOT_CLASS = getEnum(PacketType.Play.Server.ENTITY_EQUIPMENT.getPacketClass(), 0); HAND_CLASS = getEnum(PacketType.Play.Client.USE_ENTITY.getPacketClass(), 1); - DIRECTION_CLASS = getEnum(PacketType.Play.Client.USE_ITEM.getPacketClass(), 0); + DIRECTION_CLASS = getEnum(PacketType.Play.Server.SPAWN_ENTITY_PAINTING.getPacketClass(), 0); CHAT_TYPE_CLASS = getEnum(PacketType.Play.Server.CHAT.getPacketClass(), 0); associate(PROTOCOL_CLASS, Protocol.class, getClientCommandConverter());