From cb04c183a823f0491c73a29483c979f14ffcaad2 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Fri, 26 Jun 2020 20:38:30 -0400 Subject: [PATCH] Update to 1.16.1 --- Bukkit/build.gradle | 4 ++-- Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java | 2 +- .../java/com/plotsquared/bukkit/listener/PlayerEvents.java | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 6995d9034..6b011faf7 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -22,9 +22,9 @@ dependencies { implementation(project(":PlotSquared-Core")) compile("org.bstats:bstats-bukkit:1.7") compile(project(":PlotSquared-Core")) - compile("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT") + compile("com.destroystokyo.paper:paper-api:1.16.1-R0.1-SNAPSHOT") //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT' - implementation("org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT") + implementation("org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT") compile(group: "com.sk89q.worldedit", name: "worldedit-bukkit", version: "7.0.1") compile("io.papermc:paperlib:1.0.2") implementation("net.kyori:text-adapter-bukkit:3.0.3") diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index 1a40c51d5..ca21d9a3d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -123,6 +123,7 @@ import org.bukkit.World; import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.PluginCommand; import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.Listener; @@ -790,7 +791,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain< case MUSHROOM_COW: case OCELOT: case PIG: - case PIG_ZOMBIE: case RABBIT: case SHEEP: case SILVERFISH: diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java index 643f80611..c8c16a4c6 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java @@ -1389,6 +1389,11 @@ public class PlayerEvents extends PlotListener implements Listener { case BUBBLE_CORAL_FAN: case FIRE_CORAL_FAN: case HORN_CORAL_FAN: + case BRAIN_CORAL_WALL_FAN: + case BUBBLE_CORAL_WALL_FAN: + case FIRE_CORAL_WALL_FAN: + case HORN_CORAL_WALL_FAN: + case TUBE_CORAL_WALL_FAN: if (!plot.getFlag(CoralDryFlag.class)) { plot.debug("Coral could not dry because coral-dry = false"); event.setCancelled(true);