Fix some bugs in click events

SkriptLang · Mar 17, 2016 · 75e475d · 75e475d
1 parent 69e0d75
commit 75e475d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/ch/njol/skript/events/EvtClick.java b/src/main/java/ch/njol/skript/events/EvtClick.java
@@ -193,7 +193,7 @@ private boolean checkOffHandUse(@Nullable ItemStack mainHand, @Nullable ItemStac
 		if (mainHand == null) mainHand = new ItemStack(Material.AIR);
 
 		if (clickType == RIGHT) {
-			if (offHand == null || offHand.getType() == Material.AIR) return false;
+			if (offHand == null) return false;
 			switch (offHand.getType()) {
 				case BOW:
 				case EGG:
@@ -257,7 +257,9 @@ private boolean checkOffHandUse(@Nullable ItemStack mainHand, @Nullable ItemStac
 
 			if (mainHand.getType().isBlock() || mainHand.getType().isEdible()) {
 				mainUsable = true;
-			} else if (target != null) {
+			}
+
+			if (target != null) {
 				switch (target.getType()) {
 					case ANVIL:
 					case BEACON:
@@ -293,11 +295,15 @@ private boolean checkOffHandUse(@Nullable ItemStack mainHand, @Nullable ItemStac
 					case WOOD_BUTTON:
 					case STONE_BUTTON:
 					case COMMAND:
-						if (!player.isSneaking()) mainUsable = true;
+						if (player.isSneaking()) {
+							if (offHand.getType() == Material.AIR && mainHand.getType() != Material.AIR) return true;
+						} else {
+							mainUsable = true;
+						}
 				}
 			}
 		}
-				
+
 		if (mainUsable) return false;
 		else if (offUsable) return true;
 		else return false;