Skip to content

Commit bfa0eee

Browse files
committed
Fix direction and dimension enums
1 parent 308e3d3 commit bfa0eee

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,8 +1133,7 @@ public PotionEffectType getSpecific(Object generic) {
11331133
private static MethodAccessor idFromDimension = null;
11341134

11351135
public static EquivalentConverter<Integer> getDimensionIDConverter() {
1136-
return new EquivalentConverter<Integer>() {
1137-
1136+
return ignoreNull(new EquivalentConverter<Integer>() {
11381137
@Override
11391138
public Object getGeneric(Integer specific) {
11401139
if (dimensionFromId == null) {
@@ -1149,7 +1148,7 @@ public Object getGeneric(Integer specific) {
11491148
dimensionFromId = Accessors.getMethodAccessor(reflection.getMethod(contract));
11501149
}
11511150

1152-
return dimensionFromId.invoke(null, (int) specific);
1151+
return dimensionFromId.invoke(null, specific);
11531152
}
11541153

11551154
@Override
@@ -1173,6 +1172,6 @@ public Integer getSpecific(Object generic) {
11731172
public Class<Integer> getSpecificType() {
11741173
return Integer.class;
11751174
}
1176-
};
1175+
});
11771176
}
11781177
}

src/main/java/com/comphenix/protocol/wrappers/EnumWrappers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ private static void initialize() {
422422
SOUND_CATEGORY_CLASS = getEnum(PacketType.Play.Server.CUSTOM_SOUND_EFFECT.getPacketClass(), 0);
423423
ITEM_SLOT_CLASS = getEnum(PacketType.Play.Server.ENTITY_EQUIPMENT.getPacketClass(), 0);
424424
HAND_CLASS = getEnum(PacketType.Play.Client.USE_ENTITY.getPacketClass(), 1);
425-
DIRECTION_CLASS = getEnum(PacketType.Play.Client.USE_ITEM.getPacketClass(), 0);
425+
DIRECTION_CLASS = getEnum(PacketType.Play.Server.SPAWN_ENTITY_PAINTING.getPacketClass(), 0);
426426
CHAT_TYPE_CLASS = getEnum(PacketType.Play.Server.CHAT.getPacketClass(), 0);
427427

428428
associate(PROTOCOL_CLASS, Protocol.class, getClientCommandConverter());

0 commit comments

Comments
 (0)