diff --git a/pom.xml b/pom.xml index 4135d63..00504df 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.thekingelessar.assault assault - 0.12.4 + 0.12.5 jar Assault https://github.com/thekingelessar/assault diff --git a/src/main/java/com/thekingelessar/assault/game/eventhandlers/world/PlayerItemDropHandler.java b/src/main/java/com/thekingelessar/assault/game/eventhandlers/world/PlayerItemDropHandler.java index eeb0ae5..5c127c2 100644 --- a/src/main/java/com/thekingelessar/assault/game/eventhandlers/world/PlayerItemDropHandler.java +++ b/src/main/java/com/thekingelessar/assault/game/eventhandlers/world/PlayerItemDropHandler.java @@ -11,7 +11,6 @@ import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.inventory.ItemStack; -import javax.persistence.Lob; import java.util.Arrays; import java.util.List; @@ -42,7 +41,7 @@ public void onItemDrop(PlayerDropItemEvent playerDropItemEvent) return; } - if (ShopItemTool.axes.contains(itemStack.getType()) || ShopItemTool.pickaxes.contains(itemStack.getType())) + if (ShopItemTool.axes.contains(itemStack.getType()) || ShopItemTool.pickaxes.contains(itemStack.getType()) || itemStack.getType().equals(Material.SHEARS)) { playerDropItemEvent.setCancelled(true); return; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fbf2baa..1e3ecdf 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -5,7 +5,7 @@ lobby_gamemode: ADVENTURE # Allow players to rearrange their inventory while in the lobby force_lobby_inventory: true -game_start_countdown: 8 +game_start_countdown: 20 # References maps in the maps/ directory. # Map files should be in the form map_[name].yml.