Start work on Jail Sticks.

This commit is contained in:
graywolf336 2014-03-08 22:53:31 -06:00
parent 2ec69c5650
commit 274f3a03ab
3 changed files with 15 additions and 5 deletions

View File

@ -11,6 +11,7 @@ Beta 1 Changes
- MySQL data validation, basically if a cell or prisoner reference a jail which no longer exists they are removed - MySQL data validation, basically if a cell or prisoner reference a jail which no longer exists they are removed
- Fix a bug with not being able to unjail someone forcefully if they were in a cell ([#17](https://github.com/graywolf336/Jail/issues/17)) - Fix a bug with not being able to unjail someone forcefully if they were in a cell ([#17](https://github.com/graywolf336/Jail/issues/17))
- Add the record keeping system ([#12](https://github.com/graywolf336/Jail/issues/12)) - Add the record keeping system ([#12](https://github.com/graywolf336/Jail/issues/12))
- Added Jail Sticks, format of them has slightly changed ([#16](https://github.com/graywolf336/Jail/issues/16))
Changes Changes
=== ===

View File

@ -30,6 +30,7 @@ public class JailMain extends JavaPlugin {
private JailHandler jh; private JailHandler jh;
private JailIO io; private JailIO io;
private JailManager jm; private JailManager jm;
private JailStickManager jsm;
private JailTimer jt; private JailTimer jt;
private PrisonerManager pm; private PrisonerManager pm;
private boolean debug = false; private boolean debug = false;
@ -57,6 +58,7 @@ public class JailMain extends JavaPlugin {
cmdHand = new CommandHandler(this); cmdHand = new CommandHandler(this);
jh = new JailHandler(this); jh = new JailHandler(this);
pm = new PrisonerManager(this); pm = new PrisonerManager(this);
jsm = new JailStickManager(this);
PluginManager plm = this.getServer().getPluginManager(); PluginManager plm = this.getServer().getPluginManager();
plm.registerEvents(new BlockListener(this), this); plm.registerEvents(new BlockListener(this), this);
@ -97,6 +99,7 @@ public class JailMain extends JavaPlugin {
cmdHand = null; cmdHand = null;
pm = null; pm = null;
jm = null; jm = null;
jsm = null;
io = null; io = null;
hcm = null; hcm = null;
} }
@ -157,6 +160,11 @@ public class JailMain extends JavaPlugin {
return this.pm; return this.pm;
} }
/** Gets the {@link JailStickManager} instance. */
public JailStickManager getJailStickManager() {
return this.jsm;
}
/** Returns if the plugin is in debug state or not. */ /** Returns if the plugin is in debug state or not. */
public boolean inDebug() { public boolean inDebug() {
return this.debug; return this.debug;

View File

@ -12,10 +12,6 @@ storage:
username: 'root' username: 'root'
password: 'password' password: 'password'
prefix: 'j3_' prefix: 'j3_'
database: 'jailDatabase'
jails:
endermenProtection: true
explosionProtection: true
jailing: jailing:
during: during:
blockBreakPenalty: 5m blockBreakPenalty: 5m
@ -59,3 +55,8 @@ jailing:
commands: [] commands: []
restorePreviousGameMode: false restorePreviousGameMode: false
teleport: true teleport: true
database: 'jailDatabase'
jails:
endermenProtection: true
explosionProtection: true
jailstick: ["stick,30,,Running away"]