diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitConfigAPI.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitConfigAPI.java index b95e0b5c1..d432bf830 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitConfigAPI.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitConfigAPI.java @@ -167,7 +167,7 @@ public class BukkitConfigAPI extends Config implements ViaVersionConfig { @Override public boolean is1_12QuickMoveActionFix() { - return getBoolean("quick-move-action-fix", true); + return getBoolean("quick-move-action-fix", false); } @Override diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitInventoryQuickMoveProvider.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitInventoryQuickMoveProvider.java index df0c48e62..32879b914 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitInventoryQuickMoveProvider.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitInventoryQuickMoveProvider.java @@ -44,6 +44,9 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider if (!supported) { return false; } + if (slotId < 0) { // clicked out of inv slot + return false; + } ProtocolInfo info = userConnection.get(ProtocolInfo.class); UUID uuid = info.getUuid(); BukkitInventoryUpdateTask updateTask = updateTasks.get(uuid); @@ -66,9 +69,6 @@ public class BukkitInventoryQuickMoveProvider extends InventoryQuickMoveProvider } InventoryView inv = p.getOpenInventory(); short slotId = storage.getSlotId(); - if (slotId < 0) { // clicked out of inv slot - return null; - } if (slotId > inv.countSlots()) { return null; // wrong container open? } diff --git a/common/src/main/resources/assets/viaversion/config.yml b/common/src/main/resources/assets/viaversion/config.yml index a90a40505..5d59fd1f6 100644 --- a/common/src/main/resources/assets/viaversion/config.yml +++ b/common/src/main/resources/assets/viaversion/config.yml @@ -84,8 +84,8 @@ hologram-y: -0.96 piston-animation-patch: false # Should we fix nbt for 1.12 and above clients in chat messages (causes invalid item) chat-nbt-fix: true -# Should we fix shift quick move action for 1.12 clients (causes shift + double click not to work when moving items) (only works on 1.8-1.11.2 bukkit based servers) -quick-move-action-fix: true +# Experimental - Should we fix shift quick move action for 1.12 clients (causes shift + double click not to work when moving items) (only works on 1.8-1.11.2 bukkit based servers) +quick-move-action-fix: false # #----------------------------------------------------------# # 1.9 & 1.10 CLIENTS ON 1.8 SERVERS OPTIONS #