From 3b7cdbdae3d4dd07998d2d4ad060e71479f5b805 Mon Sep 17 00:00:00 2001 From: Drc-DEV <33911680+Drc-DEV@users.noreply.github.com> Date: Sun, 17 Feb 2019 18:24:46 +0100 Subject: [PATCH 1/2] Fix NoSuchFieldError (GRASS_BLOCK) on <1.13 https://pastebin.com/GeskSHNh To fix this issue: https://github.com/ProSavage/SavageFactions/issues/97 --- .../massivecraft/factions/listeners/FactionsPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 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 be484d89..07ecfa0a 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -951,7 +951,7 @@ public class FactionsPlayerListener implements Listener { public void onPlayerBoneMeal(PlayerInteractEvent event) { Block block = event.getClickedBlock(); - if (event.getAction() == Action.RIGHT_CLICK_BLOCK && block.getType() == Material.GRASS_BLOCK + if (event.getAction() == Action.RIGHT_CLICK_BLOCK && block.getType() == MultiversionMaterials.GRASS_BLOCK.parseMaterial() && event.hasItem() && event.getItem().getType() == Material.BONE_MEAL) { if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), block.getLocation(), PermissableAction.BUILD.name(), true)) { FPlayer me = FPlayers.getInstance().getById(event.getPlayer().getUniqueId().toString()); From b7acf7e62e12a6e4f4c6f9370512a774c1981296 Mon Sep 17 00:00:00 2001 From: Drc-DEV <33911680+Drc-DEV@users.noreply.github.com> Date: Sun, 17 Feb 2019 19:16:21 +0100 Subject: [PATCH 2/2] Update FRelationCommand.java --- .../java/com/massivecraft/factions/cmd/FRelationCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java index bf1ee120..9efbff03 100644 --- a/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java +++ b/src/main/java/com/massivecraft/factions/cmd/FRelationCommand.java @@ -110,7 +110,7 @@ public abstract class FRelationCommand extends FCommand { msg(TL.COMMAND_RELATIONS_EXCEEDS_ME, max, targetRelation.getPluralTranslation()); return true; } - if (them.getRelationCount(targetRelation) > max) { + if (them.getRelationCount(targetRelation) >= max) { msg(TL.COMMAND_RELATIONS_EXCEEDS_THEY, max, targetRelation.getPluralTranslation()); return true; }