From 96fe8d059ef53a4bc20672cf860195f5fd882734 Mon Sep 17 00:00:00 2001 From: Drc-DEV <33911680+Drc-DEV@users.noreply.github.com> Date: Mon, 18 Feb 2019 15:21:17 +0100 Subject: [PATCH] Fix HomeCheck (no essentials) + BONE_MEAL Material Bypass the PlayerHomeCheck if Essentials is not installed (causes exceptions) Fix BONE_MEAL multi-version support --- .../factions/listeners/FactionsPlayerListener.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index f36acc47..8ba1daa0 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -660,6 +660,9 @@ public class FactionsPlayerListener implements Listener { if (event.getPlayer().hasPermission("factions.homes.bypass")) { return; } + if (Bukkit.getPluginManager().getPlugin("Essentials") == null) { + return; + } boolean isHome = false; for (String str : SavageFactions.plugin.ess.getUser(event.getPlayer()).getHomes()) { Location home = SavageFactions.plugin.ess.getUser(event.getPlayer()).getHome(str); @@ -956,7 +959,7 @@ public class FactionsPlayerListener implements Listener { Block block = event.getClickedBlock(); if (event.getAction() == Action.RIGHT_CLICK_BLOCK && block.getType() == MultiversionMaterials.GRASS_BLOCK.parseMaterial() - && event.hasItem() && event.getItem().getType() == Material.BONE_MEAL) { + && event.hasItem() && event.getItem().getType() == MultiversionMaterials.BONE_MEAL.parseMaterial()) { if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), block.getLocation(), PermissableAction.BUILD.name(), true)) { FPlayer me = FPlayers.getInstance().getById(event.getPlayer().getUniqueId().toString()); Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(block.getLocation()));