From b7cf69666c928b24d9509846e71534ce3cc52ccf Mon Sep 17 00:00:00 2001 From: Connor Monahan Date: Thu, 20 Jul 2017 16:15:35 -0400 Subject: [PATCH] Fix #437, add team config 'borderdrop' to permit item drop near walls --- war/src/main/java/com/tommytony/war/War.java | 1 + war/src/main/java/com/tommytony/war/config/TeamConfig.java | 3 ++- .../main/java/com/tommytony/war/event/WarPlayerListener.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/war/src/main/java/com/tommytony/war/War.java b/war/src/main/java/com/tommytony/war/War.java index 4c07f92..86aecaa 100644 --- a/war/src/main/java/com/tommytony/war/War.java +++ b/war/src/main/java/com/tommytony/war/War.java @@ -235,6 +235,7 @@ public class War extends JavaPlugin { teamDefaultConfig.put(TeamConfig.APPLYPOTION, ""); teamDefaultConfig.put(TeamConfig.ECOREWARD, 0.0); teamDefaultConfig.put(TeamConfig.INVENTORYDROP, false); + teamDefaultConfig.put(TeamConfig.BORDERDROP, false); this.getDefaultInventories().clearLoadouts(); HashMap defaultLoadout = new HashMap(); diff --git a/war/src/main/java/com/tommytony/war/config/TeamConfig.java b/war/src/main/java/com/tommytony/war/config/TeamConfig.java index 25b4f86..95388f3 100644 --- a/war/src/main/java/com/tommytony/war/config/TeamConfig.java +++ b/war/src/main/java/com/tommytony/war/config/TeamConfig.java @@ -20,7 +20,8 @@ public enum TeamConfig { PLACEBLOCK (Boolean.class), APPLYPOTION(String.class), ECOREWARD(Double.class), - INVENTORYDROP(Boolean.class); + INVENTORYDROP(Boolean.class), + BORDERDROP(Boolean.class); private final Class configType; diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java index a5ca4d7..213237a 100644 --- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java @@ -139,7 +139,8 @@ public class WarPlayerListener implements Listener { return; } - if (zone.isNearWall(player.getLocation()) && itemStack != null) { + if (zone.isNearWall(player.getLocation()) && itemStack != null + && !team.getTeamConfig().resolveBoolean(TeamConfig.BORDERDROP)) { War.war.badMsg(player, "drop.item.border"); event.setCancelled(true); return;