Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-05 07:17:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into nimitz-v2

Browse Source
This commit is contained in:
cmastudios 2013-12-07 02:44:01 -06:00
commit 60b62c8b71
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
war/src/main/java/com/tommytony/war/War.java
View File

@ -206,7 +206,8 @@ public class War extends JavaPlugin {
warzoneDefaultConfig.put(WarzoneConfig.SCOREBOARD, ScoreboardType.NONE);
warzoneDefaultConfig.put(WarzoneConfig.XPKILLMETER, false);
warzoneDefaultConfig.put(WarzoneConfig.SOUPHEALING, false);
warzoneDefaultConfig.put(WarzoneConfig.ALLOWENDER, true);
teamDefaultConfig.put(TeamConfig.FLAGMUSTBEHOME, true);
teamDefaultConfig.put(TeamConfig.FLAGPOINTSONLY, false);
teamDefaultConfig.put(TeamConfig.FLAGRETURN, FlagReturn.BOTH);

3
war/src/main/java/com/tommytony/war/config/WarzoneConfig.java
View File

@ -24,7 +24,8 @@ public enum WarzoneConfig {
AUTOJOIN (Boolean.class),
SCOREBOARD (ScoreboardType.class),
XPKILLMETER (Boolean.class),
SOUPHEALING (Boolean.class);
SOUPHEALING (Boolean.class),
ALLOWENDER (Boolean.class);
private final Class<?> configType;

2
war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
View File

@ -229,7 +229,7 @@ public class WarPlayerListener implements Listener {
// another player.
player.playSound(player.getLocation(), Sound.ITEM_BREAK, 1, 0);
}
if (zone != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENDER_CHEST) {
if (zone != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENDER_CHEST && !zone.getWarzoneConfig().getBoolean(WarzoneConfig.ALLOWENDER)) {
event.setCancelled(true);
War.war.badMsg(player, "use.ender");
}