Don't add the jail if the world is null, also load the plugin after the
worlds have loaded.
This commit is contained in:
		| @@ -237,7 +237,8 @@ public class JailIO { | |||||||
| 					} | 					} | ||||||
| 				} | 				} | ||||||
| 				 | 				 | ||||||
| 				pl.getJailManager().addJail(j, false); | 				if(pl.getServer().getWorld(j.getWorldName()) != null) pl.getJailManager().addJail(j, false); | ||||||
|  | 				else pl.getLogger().severe("Failed to load the jail " + j.getName() + " as the world '" + j.getWorldName() + "' does not exist (is null). Did you remove this world?"); | ||||||
| 				break; | 				break; | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|   | |||||||
| @@ -1,191 +1,192 @@ | |||||||
| name: Jail | name: Jail | ||||||
| main: com.graywolf336.jail.JailMain | main: com.graywolf336.jail.JailMain | ||||||
| version: ${project.version}-b${BUILD_NUMBER} | version: ${project.version}-b${BUILD_NUMBER} | ||||||
| description: Ban too harsh? Kick/mute/whatever not enough? Jail bad players! | description: Ban too harsh? Kick/mute/whatever not enough? Jail bad players! | ||||||
| authors: [matejdro,multidude,graywolf336] | authors: [matejdro,multidude,graywolf336] | ||||||
| website: dev.bukkit.org/server-mods/jail/ | website: dev.bukkit.org/server-mods/jail/ | ||||||
| softdepend: [Spout, WorldEdit, Vault, Notifications] | softdepend: [Spout, WorldEdit, Vault, Notifications] | ||||||
| commands: | load: POSTWORLD | ||||||
|     jailcreate: | commands: | ||||||
|         description: Creates a new jail zone. |     jailcreate: | ||||||
|     jailcreatecells: |         description: Creates a new jail zone. | ||||||
|         description: Creates cells in existing jail zone. |     jailcreatecells: | ||||||
|     jailremove: |         description: Creates cells in existing jail zone. | ||||||
|         description: Remove existing jail zone |     jailremove: | ||||||
|     jail: |         description: Remove existing jail zone | ||||||
|         description: Jail specified player for specified amount of time. |     jail: | ||||||
|         usage: /jail [player name] (time) (jail name):(cell name) (reason) |         description: Jail specified player for specified amount of time. | ||||||
|     unjail: |         usage: /jail [player name] (time) (jail name):(cell name) (reason) | ||||||
|         description: Release a player from jail. |     unjail: | ||||||
|     unjailforce: |         description: Release a player from jail. | ||||||
|         description: Remove player from the database. |     unjailforce: | ||||||
|     jailclear: |         description: Remove player from the database. | ||||||
|         description: Unjail every player on the server. Use with caution! |     jailclear: | ||||||
|     jailclearforce: |         description: Unjail every player on the server. Use with caution! | ||||||
|         description: Remove every player from the jail database. |     jailclearforce: | ||||||
|     jailtransfer: |         description: Remove every player from the jail database. | ||||||
|         description: Transfer player from current jail to another |     jailtransfer: | ||||||
|     jailtransferall: |         description: Transfer player from current jail to another | ||||||
|         description: Transfer all players in one jail to another jail |     jailtransferall: | ||||||
|     jailcheck: |         description: Transfer all players in one jail to another jail | ||||||
|         description: Check the status of the specified player |     jailcheck: | ||||||
|     jailtelein: |         description: Check the status of the specified player | ||||||
|         description: Teleport inside jail |     jailtelein: | ||||||
|     jailteleout: |         description: Teleport inside jail | ||||||
|         description: Teleport outside of the jail. |     jailteleout: | ||||||
|     jaillist: |         description: Teleport outside of the jail. | ||||||
|         description: List all created jails |     jaillist: | ||||||
|     jailstatus: |         description: List all created jails | ||||||
|         description: Check your current jail status |     jailstatus: | ||||||
|     jailmute: |         description: Check your current jail status | ||||||
|         description: Toggle mute of the specified prisoner |     jailmute: | ||||||
|     jailstop: |         description: Toggle mute of the specified prisoner | ||||||
|         description: Stop any creation process. |     jailstop: | ||||||
|     jailset: |         description: Stop any creation process. | ||||||
|         description: modify existing jail or prisoner. |     jailset: | ||||||
|         usage: /jailset [player/jail/cell name] [property name] (property value) |         description: modify existing jail or prisoner. | ||||||
|     jailpay: |         usage: /jailset [player/jail/cell name] [property name] (property value) | ||||||
|         description: Pay money to be released early. |     jailpay: | ||||||
|         usage: /jailpay (amount) (prisoner name) |         description: Pay money to be released early. | ||||||
|     jailremovecells: |         usage: /jailpay (amount) (prisoner name) | ||||||
|         description: Remove all cells from specified jail. |     jailremovecells: | ||||||
|     jaillistcells: |         description: Remove all cells from specified jail. | ||||||
|         description: List all named cells from specified jail. |     jaillistcells: | ||||||
|     jailstick: |         description: List all named cells from specified jail. | ||||||
|         description: Toggle jailstick feature. |     jailstick: | ||||||
|     jailcreatewe: |         description: Toggle jailstick feature. | ||||||
|         description: Create a new jail zone based on existing world guard region. |     jailcreatewe: | ||||||
|     jailremovecell: |         description: Create a new jail zone based on existing world guard region. | ||||||
|         description: Remove one cell. |     jailremovecell: | ||||||
|     jailreload: |         description: Remove one cell. | ||||||
|         description: Reload jail data |     jailreload: | ||||||
|     jailrecord: |         description: Reload jail data | ||||||
|         description: Shows a players record |     jailrecord: | ||||||
|     jailversion: |         description: Shows a players record | ||||||
|         description: Shows the plugin version |     jailversion: | ||||||
|     votejail: |         description: Shows the plugin version | ||||||
|         description: Allows players to vote to jail a player |     votejail: | ||||||
|     handcuff: |         description: Allows players to vote to jail a player | ||||||
|         description: Allows the player to handcuff another player |     handcuff: | ||||||
| permissions: |         description: Allows the player to handcuff another player | ||||||
|     jail.*: | permissions: | ||||||
|         children: |     jail.*: | ||||||
|             jail.command.*: true |         children: | ||||||
|             jail.usercmd.*: true |             jail.command.*: true | ||||||
|             jail.modifyjail: true |             jail.usercmd.*: true | ||||||
|             jail.usejailstick280: true |             jail.modifyjail: true | ||||||
|             jail.canbestickjailed: true |             jail.usejailstick280: true | ||||||
|             jail.openchest: true |             jail.canbestickjailed: true | ||||||
|             jail.canswear: true |             jail.openchest: true | ||||||
|             jail.cantbejailed: true |             jail.canswear: true | ||||||
|     jail.command.*: |             jail.cantbejailed: true | ||||||
|         description: access to all admin commands |     jail.command.*: | ||||||
|         children: |         description: access to all admin commands | ||||||
|             jail.command.jailcreate: true |         children: | ||||||
|             jail.command.jailcreatecells: true |             jail.command.jailcreate: true | ||||||
|             jail.command.jailremove: true |             jail.command.jailcreatecells: true | ||||||
|             jail.command.jailremovecells: true |             jail.command.jailremove: true | ||||||
|             jail.command.jail: true |             jail.command.jailremovecells: true | ||||||
|             jail.command.unjail: true |             jail.command.jail: true | ||||||
|             jail.command.jailtransfer: true |             jail.command.unjail: true | ||||||
|             jail.command.jailtransferall: true |             jail.command.jailtransfer: true | ||||||
|             jail.command.jailcheck: true |             jail.command.jailtransferall: true | ||||||
|             jail.command.jailtelein: true |             jail.command.jailcheck: true | ||||||
|             jail.command.jailteleout: true |             jail.command.jailtelein: true | ||||||
|             jail.command.jaillist: true |             jail.command.jailteleout: true | ||||||
|             jail.command.jaillistcells: true |             jail.command.jaillist: true | ||||||
|             jail.command.unjailforce: true |             jail.command.jaillistcells: true | ||||||
|             jail.command.jailclear: true |             jail.command.unjailforce: true | ||||||
|             jail.command.jailclearforce: true |             jail.command.jailclear: true | ||||||
|             jail.command.jailmute: true |             jail.command.jailclearforce: true | ||||||
|             jail.command.jailstop: true |             jail.command.jailmute: true | ||||||
|             jail.command.jailset: true |             jail.command.jailstop: true | ||||||
|             jail.command.jailcreatewe: true |             jail.command.jailset: true | ||||||
|             jail.command.jailremovecell: true |             jail.command.jailcreatewe: true | ||||||
|             jail.command.jailreload: true |             jail.command.jailremovecell: true | ||||||
|             jail.command.jailrecord: true |             jail.command.jailreload: true | ||||||
|             jail.command.handcuff: true |             jail.command.jailrecord: true | ||||||
|     jail.usercmd.*: |             jail.command.handcuff: true | ||||||
|         description: access to all user commands |     jail.usercmd.*: | ||||||
|         children: |         description: access to all user commands | ||||||
|             jail.usercmd.jailstatus: true |         children: | ||||||
|             jail.usercmd.jailpay: true |             jail.usercmd.jailstatus: true | ||||||
|             jail.usercmd.jailstick: true |             jail.usercmd.jailpay: true | ||||||
|             jail.usercmd.votejail: true |             jail.usercmd.jailstick: true | ||||||
|             jail.usercmd.votejail.player: true |             jail.usercmd.votejail: true | ||||||
|             jail.usercmd.jailversion: true |             jail.usercmd.votejail.player: true | ||||||
|     jail.command.jail: |             jail.usercmd.jailversion: true | ||||||
|         default: op |     jail.command.jail: | ||||||
|     jail.command.jailcreate: |         default: op | ||||||
|         default: op |     jail.command.jailcreate: | ||||||
|     jail.command.jailcreatecells: |         default: op | ||||||
|         default: op |     jail.command.jailcreatecells: | ||||||
|     jail.command.jailremove: |         default: op | ||||||
|         default: op |     jail.command.jailremove: | ||||||
|     jail.command.jailremovecells: |         default: op | ||||||
|         default: op |     jail.command.jailremovecells: | ||||||
|     jail.command.unjail: |         default: op | ||||||
|         default: op |     jail.command.unjail: | ||||||
|     jail.command.jailtransfer: |         default: op | ||||||
|         default: op |     jail.command.jailtransfer: | ||||||
|     jail.command.jailtransferall: |         default: op | ||||||
|         default: op |     jail.command.jailtransferall: | ||||||
|     jail.command.jailcheck: |         default: op | ||||||
|         default: op |     jail.command.jailcheck: | ||||||
|     jail.command.jailtelein: |         default: op | ||||||
|         default: op |     jail.command.jailtelein: | ||||||
|     jail.command.jailteleout: |         default: op | ||||||
|         default: op |     jail.command.jailteleout: | ||||||
|     jail.command.jaillist: |         default: op | ||||||
|         default: op |     jail.command.jaillist: | ||||||
|     jail.command.jaillistcells: |         default: op | ||||||
|         default: op |     jail.command.jaillistcells: | ||||||
|     jail.command.unjailforce: |         default: op | ||||||
|         default: op |     jail.command.unjailforce: | ||||||
|     jail.command.jailclear: |         default: op | ||||||
|         default: op |     jail.command.jailclear: | ||||||
|     jail.command.jailclearforce: |         default: op | ||||||
|         default: op |     jail.command.jailclearforce: | ||||||
|     jail.command.jailmute: |         default: op | ||||||
|         default: op |     jail.command.jailmute: | ||||||
|     jail.command.jailstop: |         default: op | ||||||
|         default: op |     jail.command.jailstop: | ||||||
|     jail.command.jailset: |         default: op | ||||||
|         default: op |     jail.command.jailset: | ||||||
|     jail.command.jailcreatewe: |         default: op | ||||||
|         default: op |     jail.command.jailcreatewe: | ||||||
|     jail.command.jailremovecell: |         default: op | ||||||
|         default: op |     jail.command.jailremovecell: | ||||||
|     jail.command.jailreload: |         default: op | ||||||
|         default: op |     jail.command.jailreload: | ||||||
|     jail.command.jailrecord: |         default: op | ||||||
|         default: op |     jail.command.jailrecord: | ||||||
|     jail.usercmd.jailversion: |         default: op | ||||||
|         default: true |     jail.usercmd.jailversion: | ||||||
|     jail.command.handcuff: |         default: true | ||||||
|         default: op |     jail.command.handcuff: | ||||||
|     jail.usercmd.jailvote: |         default: op | ||||||
|         default: true |     jail.usercmd.jailvote: | ||||||
|     jail.usercmd.jailvote.player: |         default: true | ||||||
|         default: op |     jail.usercmd.jailvote.player: | ||||||
|     jail.usercmd.jailvote.immune: |         default: op | ||||||
|         default: op |     jail.usercmd.jailvote.immune: | ||||||
|     jail.usercmd.jailstatus: |         default: op | ||||||
|         default: true |     jail.usercmd.jailstatus: | ||||||
|     jail.usercmd.jailpay: |         default: true | ||||||
|         default: true |     jail.usercmd.jailpay: | ||||||
|     jail.usercmd.jailstick: |         default: true | ||||||
|         default: true |     jail.usercmd.jailstick: | ||||||
|     jail.modifyjail: |         default: true | ||||||
|         default: op |     jail.modifyjail: | ||||||
|     jail.usejailstick280: |         default: op | ||||||
|         default: op |     jail.usejailstick280: | ||||||
|         description: change 280 for another jailstick item |         default: op | ||||||
|     jail.canbestickjailed: |         description: change 280 for another jailstick item | ||||||
|         default: true |     jail.canbestickjailed: | ||||||
|     jail.openchest: |         default: true | ||||||
|         default: op |     jail.openchest: | ||||||
|     jail.canswear: |         default: op | ||||||
|         default: op |     jail.canswear: | ||||||
|     jail.cantbejailed: |         default: op | ||||||
|  |     jail.cantbejailed: | ||||||
|         default: op |         default: op | ||||||
		Reference in New Issue
	
	Block a user
	 graywolf336
					graywolf336