From 32e003b0aea5f083990ba56152e2cd1ede7f88d1 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Mon, 25 Apr 2016 20:22:35 -0700 Subject: [PATCH] Fixed boat spam. Old code didn't cover new boat types. --- .../GriefPrevention/PlayerEventHandler.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java index 901f12b..e6b9183 100644 --- a/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java @@ -1798,7 +1798,13 @@ class PlayerEventHandler implements Listener return; } - else if(clickedBlock != null && materialInHand == Material.BOAT) + else if(clickedBlock != null && ( + materialInHand == Material.BOAT || + materialInHand == Material.BOAT_ACACIA || + materialInHand == Material.BOAT_BIRCH || + materialInHand == Material.BOAT_DARK_OAK || + materialInHand == Material.BOAT_JUNGLE || + materialInHand == Material.BOAT_SPRUCE)) { if(playerData == null) playerData = this.dataStore.getPlayerData(player.getUniqueId()); Claim claim = this.dataStore.getClaimAt(clickedBlock.getLocation(), false, playerData.lastClaim); @@ -1836,7 +1842,7 @@ class PlayerEventHandler implements Listener } //if it's a spawn egg, minecart, or boat, and this is a creative world, apply special rules - else if(clickedBlock != null && (materialInHand == Material.MINECART || materialInHand == Material.POWERED_MINECART || materialInHand == Material.STORAGE_MINECART || materialInHand == Material.BOAT || materialInHand == Material.ARMOR_STAND || materialInHand == Material.ITEM_FRAME || materialInHand == Material.MONSTER_EGG || materialInHand == Material.MONSTER_EGGS || materialInHand == Material.EXPLOSIVE_MINECART || materialInHand == Material.HOPPER_MINECART) && GriefPrevention.instance.creativeRulesApply(clickedBlock.getLocation())) + else if(clickedBlock != null && (materialInHand == Material.MINECART || materialInHand == Material.POWERED_MINECART || materialInHand == Material.STORAGE_MINECART || materialInHand == Material.ARMOR_STAND || materialInHand == Material.ITEM_FRAME || materialInHand == Material.MONSTER_EGG || materialInHand == Material.MONSTER_EGGS || materialInHand == Material.EXPLOSIVE_MINECART || materialInHand == Material.HOPPER_MINECART) && GriefPrevention.instance.creativeRulesApply(clickedBlock.getLocation())) { //player needs build permission at this location String noBuildReason = GriefPrevention.instance.allowBuild(player, clickedBlock.getLocation(), Material.MINECART);