Merge branch 'dev'

mung3r · Nov 14, 2016 · e24df35 · e24df35
2 parents b7436e7 + 5ae2415
commit e24df35
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>se.crafted.chrisb</groupId>
   <artifactId>ecoCreature</artifactId>
   <name>ecoCreature</name>
-  <version>0.3.2-SNAPSHOT</version>
+  <version>0.3.3-SNAPSHOT</version>
   <description>Player vs. Monster/Enemy Rewards</description>
   <url>http://dev.bukkit.org/server-mods/ecocreature/</url>
   <inceptionYear>2011</inceptionYear>
@@ -16,7 +16,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.9.4-R0.1-SNAPSHOT</bukkit.version>
+    <bukkit.version>1.10-R0.1-SNAPSHOT</bukkit.version>
     <vault.version>1.5</vault.version>
     <currentYear>2015</currentYear>
   </properties>
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>org.mcstats.bukkit</groupId>
       <artifactId>metrics</artifactId>
-      <version>R7</version>
+      <version>R8-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.bukkit</groupId>

diff --git a/src/main/java/se/crafted/chrisb/ecoCreature/commons/ItemUtils.java b/src/main/java/se/crafted/chrisb/ecoCreature/commons/ItemUtils.java
@@ -21,9 +21,9 @@
 
 import java.lang.reflect.Field;
 
-import net.minecraft.server.v1_9_R2.NBTTagCompound;
+import net.minecraft.server.v1_10_R1.NBTTagCompound;
 
-import org.bukkit.craftbukkit.v1_9_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
 public final class ItemUtils
@@ -60,7 +60,7 @@ private static NBTTagCompound getTag(ItemStack item)
             try {
                 Field field = CraftItemStack.class.getDeclaredField("handle");
                 field.setAccessible(true);
-                return ((net.minecraft.server.v1_9_R2.ItemStack) field.get(item)).getTag();
+                return ((net.minecraft.server.v1_10_R1.ItemStack) field.get(item)).getTag();
             }
             catch (Exception ignored) {
             }
@@ -72,11 +72,11 @@ private static ItemStack setTag(ItemStack item, NBTTagCompound tag)
     {
         CraftItemStack cItem = item instanceof CraftItemStack ? (CraftItemStack) item : CraftItemStack.asCraftCopy(item);
 
-        net.minecraft.server.v1_9_R2.ItemStack nmsItem = null;
+        net.minecraft.server.v1_10_R1.ItemStack nmsItem = null;
         try {
             Field field = CraftItemStack.class.getDeclaredField("handle");
             field.setAccessible(true);
-            nmsItem = (net.minecraft.server.v1_9_R2.ItemStack) field.get(item);
+            nmsItem = (net.minecraft.server.v1_10_R1.ItemStack) field.get(item);
         }
         catch (Exception ignored) {
         }

diff --git a/src/main/java/se/crafted/chrisb/ecoCreature/commons/PluginUtils.java b/src/main/java/se/crafted/chrisb/ecoCreature/commons/PluginUtils.java
@@ -174,7 +174,7 @@ public static MobArenaHandler getMobArenaHandler()
 
     public static boolean hasHeroes()
     {
-        return heroesPlugin != null && heroesPlugin.isEnabled();
+        return heroesPlugin != null;
     }
 
     public static Heroes getHeroes()