From 89e2a6377727b2d34b44c13eeb5ebc05b9385f63 Mon Sep 17 00:00:00 2001 From: MrMicky Date: Fri, 10 Apr 2020 13:57:24 +0200 Subject: [PATCH] Don't send offhand on 1.8 --- .../java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java | 7 +++++-- .../java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java index 3c01e0f..b090c8a 100755 --- a/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java +++ b/nms/v1_8_R2/src/main/java/net/jitse/npclib/nms/v1_8_R2/NPC_v1_8_R2.java @@ -97,8 +97,11 @@ public class NPC_v1_8_R2 extends NPCBase { public void sendEquipmentPacket(Player player, NPCSlot slot, boolean auto) { PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection; - if (slot == NPCSlot.OFFHAND && !auto) { - throw new UnsupportedOperationException("Offhand is not supported on servers below 1.9"); + if (slot == NPCSlot.OFFHAND) { + if (!auto) { + throw new UnsupportedOperationException("Offhand is not supported on servers below 1.9"); + } + return; } ItemStack item = getItem(slot); diff --git a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java index 61961de..c2dea9f 100755 --- a/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java +++ b/nms/v1_8_R3/src/main/java/net/jitse/npclib/nms/v1_8_R3/NPC_v1_8_R3.java @@ -98,8 +98,11 @@ public class NPC_v1_8_R3 extends NPCBase { public void sendEquipmentPacket(Player player, NPCSlot slot, boolean auto) { PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection; - if (slot == NPCSlot.OFFHAND && !auto) { - throw new UnsupportedOperationException("Offhand is not supported on servers below 1.9"); + if (slot == NPCSlot.OFFHAND) { + if (!auto) { + throw new UnsupportedOperationException("Offhand is not supported on servers below 1.9"); + } + return; } ItemStack item = getItem(slot);