summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-12-21 07:00:00 +1100
committermd_5 <git@md-5.net>2016-12-21 07:00:00 +1100
commit506e9411267240a81a016a47b2c093bedad50a81 (patch)
treeb873d39a46bab94c124f0e7e6fd3ac6d521924af
parent55fa63e8b9c8f5f315f3d631fad2096a008074df (diff)
downloadbukkit-506e9411267240a81a016a47b2c093bedad50a81.tar
bukkit-506e9411267240a81a016a47b2c093bedad50a81.tar.gz
bukkit-506e9411267240a81a016a47b2c093bedad50a81.tar.lz
bukkit-506e9411267240a81a016a47b2c093bedad50a81.tar.xz
bukkit-506e9411267240a81a016a47b2c093bedad50a81.zip
Update to Minecraft 1.11.1
-rw-r--r--pom.xml2
-rw-r--r--src/main/java/org/bukkit/Material.java1
-rw-r--r--src/main/java/org/bukkit/Statistic.java2
-rw-r--r--src/main/java/org/bukkit/enchantments/Enchantment.java5
4 files changed, 7 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 0ab2a108..f94706a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
- <version>1.11-R0.1-SNAPSHOT</version>
+ <version>1.11.1-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Bukkit</name>
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 62062234..32ea7d01 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -503,6 +503,7 @@ public enum Material {
BOAT_DARK_OAK(448, 1),
TOTEM(449, 1),
SHULKER_SHELL(450),
+ IRON_NUGGET(452),
GOLD_RECORD(2256, 1),
GREEN_RECORD(2257, 1),
RECORD_3(2258, 1),
diff --git a/src/main/java/org/bukkit/Statistic.java b/src/main/java/org/bukkit/Statistic.java
index a23397f5..1472d9a6 100644
--- a/src/main/java/org/bukkit/Statistic.java
+++ b/src/main/java/org/bukkit/Statistic.java
@@ -11,8 +11,6 @@ public enum Statistic {
PLAYER_KILLS,
FISH_CAUGHT,
ANIMALS_BRED,
- TREASURE_FISHED,
- JUNK_FISHED,
LEAVE_GAME,
JUMP,
DROP(Type.ITEM),
diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
index 1c440e99..67d9c77a 100644
--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
@@ -96,6 +96,11 @@ public abstract class Enchantment {
public static final Enchantment LOOT_BONUS_MOBS = new EnchantmentWrapper(21);
/**
+ * Increases damage against targets when using a sweep attack
+ */
+ public static final Enchantment SWEEPING_EDGE = new EnchantmentWrapper(22);
+
+ /**
* Increases the rate at which you mine/dig
*/
public static final Enchantment DIG_SPEED = new EnchantmentWrapper(32);