diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java index 28d59265c..d8463f977 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java @@ -241,17 +241,19 @@ public class WorldPackets { // Write item in hand Item item = Item.getItem(Protocol1_9TO1_8.getHandItem(wrapper.user())); // Blocking patch - if (item != null) { - if (Material.getMaterial(item.getId()) != null) { - if (Material.getMaterial(item.getId()).name().endsWith("SWORD")) { - if (hand == 0) { - EntityTracker tracker = wrapper.user().get(EntityTracker.class); - if (!tracker.isBlocking()) { - tracker.setBlocking(true); - Item shield = new Item((short) 442, (byte) 1, (short) 0, null); - tracker.setSecondHand(shield); + if (ViaVersion.getConfig().isShieldBlocking()) { + if (item != null) { + if (Material.getMaterial(item.getId()) != null) { + if (Material.getMaterial(item.getId()).name().endsWith("SWORD")) { + if (hand == 0) { + EntityTracker tracker = wrapper.user().get(EntityTracker.class); + if (!tracker.isBlocking()) { + tracker.setBlocking(true); + Item shield = new Item((short) 442, (byte) 1, (short) 0, null); + tracker.setSecondHand(shield); + } + wrapper.cancel(); } - wrapper.cancel(); } } }