diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java index f593f3c3c..21550d853 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/com/earth2me/essentials/Mob.java @@ -89,7 +89,8 @@ public enum Mob { PILLAGER("Pillager", Enemies.ENEMY, "PILLAGER"), RAVAGER("Ravager", Enemies.ENEMY, "RAVAGER"), TRADER_LLAMA("TraderLlama", Enemies.FRIENDLY, "TRADER_LLAMA"), - WANDERING_TRADER("WanderingTrader", Enemies.FRIENDLY, "WANDERING_TRADER") + WANDERING_TRADER("WanderingTrader", Enemies.FRIENDLY, "WANDERING_TRADER"), + BEE("Bee", Enemies.NEUTRAL, "BEE") ; public static final Logger logger = Logger.getLogger("Essentials"); diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index d14eef535..46f0e14f9 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -436,19 +436,6 @@ public class OfflinePlayer implements Player { return true; } - @Override - public void awardAchievement(Achievement a) { - } - - @Override - public void removeAchievement(Achievement achievement) { - } - - @Override - public boolean hasAchievement(Achievement achievement) { - return false; - } - @Override public void incrementStatistic(Statistic ststc) { } diff --git a/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java index 717459d9e..fdc2e433a 100644 --- a/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/com/earth2me/essentials/utils/VersionUtil.java @@ -25,8 +25,9 @@ public class VersionUtil { public static final BukkitVersion v1_14_2_R01 = BukkitVersion.fromString("1.14.2-R0.1-SNAPSHOT"); public static final BukkitVersion v1_14_3_R01 = BukkitVersion.fromString("1.14.3-R0.1-SNAPSHOT"); public static final BukkitVersion v1_14_4_R01 = BukkitVersion.fromString("1.14.4-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_15_R01 = BukkitVersion.fromString("1.15-R0.1-SNAPSHOT"); - private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01); + private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_R01); private static BukkitVersion serverVersion = null; diff --git a/pom.xml b/pom.xml index d29c2bc4d..08fd3fed3 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ org.bukkit bukkit - 1.14.4-R0.1-SNAPSHOT + 1.15-R0.1-SNAPSHOT provided