Fix #93 and #98 (both major bugs)

Author: bensku

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.njol</groupId>
 	<artifactId>skript</artifactId>
-	<version>2.2-dev15</version>
+	<version>2.2-dev16</version>
 	<name>Skript</name>
 	<description>A plugin for the Minecraft server API Bukkit that allows to create scripts in natural language.</description>
 	<url>http://njol.ch/projects/skript/</url>

src/main/java/ch/njol/skript/aliases/ItemType.java

@@ -794,8 +794,8 @@ public boolean removeAll(final Inventory invi) {
 	 * @return Whether everything could be removed from the inventory
 	 */
 	public boolean removeFrom(final Inventory invi) {
-		final ItemStack[] buf = getStorageContents(invi);
-		final ItemStack[] armour = invi instanceof PlayerInventory ? ((PlayerInventory) invi).getArmorContents() : null;
+		final ItemStack[] buf = oldInvSize ? getStorageContents(invi) : getCopiedContents(invi);
+		final ItemStack[] armour = invi instanceof PlayerInventory && !oldInvSize ? ((PlayerInventory) invi).getArmorContents() : null;
 
 		@SuppressWarnings("unchecked")
 		final boolean ok = removeFrom(Arrays.asList(buf), armour == null ? null : Arrays.asList(armour));

src/main/java/ch/njol/skript/events/EvtClick.java

@@ -27,6 +27,7 @@
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Vehicle;
 import org.bukkit.event.Event;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
@@ -333,6 +334,9 @@ public static boolean checkUseOffHand(Player player, int clickType, @Nullable Bl
 				default:
 					mainOnly = false;
 			}
+			
+			if (entity instanceof Vehicle)
+				mainOnly = true;
 		}
 
 		boolean isSneaking = player.isSneaking();