EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Reimplment automatically jailing in cells, fixes #42.

Browse Source 
New config option if you want to disable this option.
This commit is contained in:
graywolf336 2015-02-09 22:08:59 -06:00
parent 205e7a4e22
commit d819bd7d37
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/graywolf336/jail/command/subcommands/JailCommand.java
View File

@ -146,8 +146,9 @@ public class JailCommand implements Command {
}
}
//If they want just any open cell, then let's find the first empty one
if(params.isAnyCell()) {
//If they want just any open cell or automatic jailing in cells is turned on
//and a cell wasn't already found, then find try to find a cell
if((params.isAnyCell() || jm.getPlugin().getConfig().getBoolean(Settings.AUTOMATICCELL.getPath(), true)) && c == null) {
c = jm.getJail(jailName).getFirstEmptyCell();
if(c == null) {
//If there wasn't an empty cell, then tell them so.

1
src/main/java/com/graywolf336/jail/enums/Settings.java
View File

@ -1,6 +1,7 @@
package com.graywolf336.jail.enums;
public enum Settings {
AUTOMATICCELL("jailing.jail.automaticCell"),
AUTOMATICMUTE("jailing.jail.automaticMute"),
BROADCASTJAILING("jailing.jail.broadcastJailing"),
BLOCKBREAKPENALTY("jailing.during.blockBreakPenalty"),

1
src/main/resources/config.yml
View File

@ -54,6 +54,7 @@ jailing:
title: 'Jail Info'
time: '&aTime:'
jail:
automaticCell: true
automaticMute: true
broadcastJailing: false
clothing:

1
src/test/java/test/java/com/graywolf336/jail/TestJailDefaultConfig.java
View File

@ -123,6 +123,7 @@ public class TestJailDefaultConfig {
@Test
public void testJailingDefaultConfig() {
assertTrue("Default setting for automatically jailing in cells is false.", main.getConfig().getBoolean(Settings.AUTOMATICCELL.getPath()));
assertTrue("Default setting for automatically muting is false.", main.getConfig().getBoolean(Settings.AUTOMATICMUTE.getPath()));
assertFalse("Default setting for broadcasting a jailing is true.", main.getConfig().getBoolean(Settings.BROADCASTJAILING.getPath()));
assertTrue("Default setting for jail clothing is not enabled.", main.getConfig().getBoolean(Settings.CLOTHINGENABLED.getPath()));