pom.xml update

Author: bensku

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.njol</groupId>
 	<artifactId>skript</artifactId>
-	<version>2.2-dev13</version>
+	<version>2.2-dev13b</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/bukkitutil/PlayerUtils.java

@@ -30,6 +30,8 @@
 import java.util.Set;
 
 import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -104,4 +106,28 @@ public final static Collection<? extends Player> getOnlinePlayers() {
 		}
 	}
 
+	
+	public final static boolean canEat(Player p, Material food) {
+		GameMode gm = p.getGameMode();
+		if (gm == GameMode.CREATIVE || gm == GameMode.SPECTATOR)
+			return false; // Can't eat anything in those gamemodes
+		
+		boolean edible = food.isEdible();
+		if (!edible)
+			return false;
+		boolean special;
+		switch (food) {
+			case GOLDEN_APPLE:
+			case CHORUS_FRUIT:
+				special = true;
+				break;
+				//$CASES-OMITTED$
+			default:
+				special = false;
+		}
+		if (p.getFoodLevel() < 20 || special)
+			return true;
+		
+		return false;
+	}
 }

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

@@ -37,6 +37,7 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.bukkitutil.PlayerUtils;
 import ch.njol.skript.classes.Comparator.Relation;
 import ch.njol.skript.classes.data.DefaultComparators;
 import ch.njol.skript.entity.EntityData;
@@ -103,7 +104,7 @@ public boolean check(final Event e) {
 
 		if (e instanceof PlayerInteractEntityEvent) {
 			PlayerInteractEntityEvent clickEvent = ((PlayerInteractEntityEvent) e);
-			if (Skript.isRunningMinecraft(1, 9)) { // If player has empty hand, BOTH hands trigger the event (might be a bug?)
+			if (Skript.isRunningMinecraft(1, 9)) {
 				ItemStack mainHand = clickEvent.getPlayer().getInventory().getItemInMainHand();
 				ItemStack offHand = clickEvent.getPlayer().getInventory().getItemInOffHand();
 
@@ -123,7 +124,7 @@ public boolean check(final Event e) {
 			block = null;
 		} else if (e instanceof PlayerInteractEvent) {
 			PlayerInteractEvent clickEvent = ((PlayerInteractEvent) e);
-			if (Skript.isRunningMinecraft(1, 9)) { // If player has empty hand, BOTH hands trigger the event (might be a bug?)
+			if (Skript.isRunningMinecraft(1, 9)) {
 				ItemStack mainHand = clickEvent.getPlayer().getInventory().getItemInMainHand();
 				ItemStack offHand = clickEvent.getPlayer().getInventory().getItemInOffHand();
 
@@ -198,6 +199,11 @@ public static boolean checkUseOffHand(Player player, int clickType, @Nullable Bl
 		ItemStack mainHand = player.getInventory().getItemInMainHand();
 		ItemStack offHand = player.getInventory().getItemInOffHand();
 
+		Material mainMat = mainHand.getType();
+		Material offMat = offHand.getType();
+		assert mainMat != null;
+		assert offMat != null;
+		
 		//Skript.info("block is " + block);
 		//Skript.info("entity is " + entity);
 
@@ -231,7 +237,7 @@ public static boolean checkUseOffHand(Player player, int clickType, @Nullable Bl
 		}
 
 		// Seriously? Empty hand -> block in hand, since id of AIR < 256 :O
-		if ((offHand.getType().isBlock() && offHand.getType() != Material.AIR) || offHand.getType().isEdible()) {
+		if ((offMat.isBlock() && offMat != Material.AIR) || PlayerUtils.canEat(player, offMat)) {
 			offUsable = true;
 		}
 
@@ -264,7 +270,7 @@ public static boolean checkUseOffHand(Player player, int clickType, @Nullable Bl
 		}
 
 		// Seriously? Empty hand -> block in hand, since id of AIR < 256 :O
-		if ((mainHand.getType().isBlock() && mainHand.getType() != Material.AIR) || mainHand.getType().isEdible()) {
+		if ((mainMat.isBlock() && mainMat != Material.AIR) || PlayerUtils.canEat(player, mainMat)) {
 			mainUsable = true;
 		}