Bradley Hilton 
							
						 
					 
					
						
						
							
						
						882f6c76cd 
					 
					
						
						
							
							Merge pull request  #1  from graywolf336/NewCommands  
						
						 
						
						... 
						
						
						
						New Command System 
						
						
					 
					
						2014-01-28 20:42:06 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						c3b3e390b0 
					 
					
						
						
							
							Make the subcommands of /jail work. :)  
						
						 
						
						
						
						
					 
					
						2014-01-28 22:34:39 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						cab6d7fdf9 
					 
					
						
						
							
							When unjailing someone, if they've never been online and have time  
						
						 
						
						... 
						
						
						
						remaining then forcefully remove them. 
						
						
					 
					
						2014-01-28 22:20:33 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						2acfbf098e 
					 
					
						
						
							
							Quick fix, but let's parse the jail command if no args.  
						
						 
						
						
						
						
					 
					
						2014-01-28 16:23:20 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						9f4ebd5993 
					 
					
						
						
							
							Fix some formatting, not actually needed but oh well  
						
						 
						
						
						
						
					 
					
						2014-01-28 14:24:37 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						691d59f0f7 
					 
					
						
						
							
							Work on the new command system, this is not ready at all.  
						
						 
						
						... 
						
						
						
						This commit is only so I can work on it more at another computer. 
						
						
					 
					
						2014-01-27 18:02:24 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						cb8de04a91 
					 
					
						
						
							
							Temp work on the jailcheck command, not finishing.  
						
						 
						
						... 
						
						
						
						It has been decided we are going to be switching the command structure
up, more details to come. 
						
						
					 
					
						2014-01-23 18:51:22 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						e0dc22dfec 
					 
					
						
						
							
							Add the JailReload command.  
						
						 
						
						
						
						
					 
					
						2014-01-23 18:05:35 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						010b592fb5 
					 
					
						
						
							
							Add the JailMute, JailTeleIn, and JailTeleOut commands.  
						
						 
						
						
						
						
					 
					
						2014-01-23 17:52:21 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						4ac89455b0 
					 
					
						
						
							
							Add the JailClearCommand back, this time releasing all the prisoners.  
						
						 
						
						
						
						
					 
					
						2014-01-23 13:07:26 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						13363f6d9a 
					 
					
						
						
							
							Rename the JailClear to JailClearForce  
						
						 
						
						
						
						
					 
					
						2014-01-22 17:55:47 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						d6ad4df991 
					 
					
						
						
							
							Log the unjailing to console if we have that enabled.  
						
						 
						
						
						
						
					 
					
						2014-01-22 17:48:32 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						cb22fe9786 
					 
					
						
						
							
							Let's try out the move protection, maybe this will work the first time  
						
						 
						
						
						
						
					 
					
						2014-01-22 14:43:14 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						fe1db3bb04 
					 
					
						
						
							
							Prevent interaction with items and blocks!  
						
						 
						
						... 
						
						
						
						Works just like the old version, they can interact with anything except
what is in the blacklist. 
						
						
					 
					
						2014-01-21 22:23:26 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						1e3a8cc992 
					 
					
						
						
							
							Change the priority of the crop trampling to be called first so it  
						
						 
						
						... 
						
						
						
						cancels the event before any other interact event gets it. 
						
						
					 
					
						2014-01-21 21:44:58 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						863793543f 
					 
					
						
						
							
							Allow protecting and penalizing trampling of crops.  
						
						 
						
						
						
						
					 
					
						2014-01-21 21:37:52 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						4e06336c99 
					 
					
						
						
							
							Simple way of stopping players from getting respawned outside the jail.  
						
						 
						
						... 
						
						
						
						Something more complicated might be needed, but I will add that as the
time arises. 
						
						
					 
					
						2014-01-21 21:12:50 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						1cfd64164c 
					 
					
						
						
							
							Change the priorities of the event listeners, this way the protections  
						
						 
						
						... 
						
						
						
						and the penalties get applied before the other listener cancels it. 
						
						
					 
					
						2014-01-21 20:52:19 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						06aa6629b7 
					 
					
						
						
							
							Finally get all the messages on the jail command to come from the  
						
						 
						
						... 
						
						
						
						language system. :) 
						
						
					 
					
						2014-01-21 19:56:14 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						9a9a75dc1e 
					 
					
						
						
							
							Fix my comment, would have threw someone off in the future I imagine  
						
						 
						
						
						
						
					 
					
						2014-01-21 18:11:46 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						34ac65565c 
					 
					
						
						
							
							More command workings and using the custom languages.  
						
						 
						
						
						
						
					 
					
						2014-01-21 18:09:47 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						3ab751baa8 
					 
					
						
						
							
							Nullify the prisoners and cells before saving them.  
						
						 
						
						
						
						
					 
					
						2014-01-21 16:14:26 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						c956018d1e 
					 
					
						
						
							
							Add work on jailclear and also the jail command to use language string.  
						
						 
						
						
						
						
					 
					
						2014-01-21 15:12:09 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						38438e2eb8 
					 
					
						
						
							
							Change it so that offline pending is used always, then inside that we  
						
						 
						
						... 
						
						
						
						check the remaining time 
						
						
					 
					
						2014-01-21 14:37:48 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						d691f1104b 
					 
					
						
						
							
							If the time of the prisoner on joining is 0, then unjail them. Also,  
						
						 
						
						... 
						
						
						
						ignore the sleeping state if enabled in the config. 
						
						
					 
					
						2014-01-21 14:09:18 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						abb3e70bdf 
					 
					
						
						
							
							Enable protecting endermen protections in jails  
						
						 
						
						
						
						
					 
					
						2014-01-21 12:31:56 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						4179a6a2d3 
					 
					
						
						
							
							Move the explosion protection to a different section of the config.  
						
						 
						
						... 
						
						
						
						This way it makes more sense, as the explosionProtection is for the
jails and not during the jailing. 
						
						
					 
					
						2014-01-21 12:21:33 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						b005248deb 
					 
					
						
						
							
							If the time is 0, then send a different message.  
						
						 
						
						
						
						
					 
					
						2014-01-21 12:10:43 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						4c13948549 
					 
					
						
						
							
							Make the command execution throw an exception, and let's catch it.  
						
						 
						
						
						
						
					 
					
						2014-01-21 11:22:26 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						9f34304fdb 
					 
					
						
						
							
							Enable protecting chests and people being able to open them and not.  
						
						 
						
						
						
						
					 
					
						2014-01-20 17:24:22 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						4eae8778ea 
					 
					
						
						
							
							Enable food control  
						
						 
						
						
						
						
					 
					
						2014-01-20 15:24:27 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						392b1d94cc 
					 
					
						
						
							
							Prevent commands from being executed, except those whitelisted  
						
						 
						
						
						
						
					 
					
						2014-01-20 14:40:03 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						af58eea360 
					 
					
						
						
							
							It's crops as well for placing, whoops  
						
						 
						
						
						
						
					 
					
						2014-01-20 12:26:03 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						18265777dd 
					 
					
						
						
							
							It's crops and not wheat, also add potatos to the default whitelist.  
						
						 
						
						
						
						
					 
					
						2014-01-20 12:24:09 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						28953682ae 
					 
					
						
						
							
							Add some debugging messages to the placing/breaking so we can see what  
						
						 
						
						... 
						
						
						
						block are what, will be helpful for figuring out what to add to the
whitelist of placing/breaking. 
						
						
					 
					
						2014-01-20 12:10:12 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						43cee6311a 
					 
					
						
						
							
							Add two more tests and rename our Util test class to reflect the usage.  
						
						 
						
						
						
						
					 
					
						2014-01-19 16:01:12 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						f41ee77092 
					 
					
						
						
							
							Enable checking the whitelist of breaking and placing.  
						
						 
						
						
						
						
					 
					
						2014-01-19 15:53:42 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						da26bc172e 
					 
					
						
						
							
							Next up is protecting against placing blocks.  
						
						 
						
						
						
						
					 
					
						2014-01-19 14:49:42 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						95649e7f03 
					 
					
						
						
							
							Start work on the protection and penalties. First up is Block Place  
						
						 
						
						
						
						
					 
					
						2014-01-19 14:40:39 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						d9d0de046d 
					 
					
						
						
							
							Fix the tests failing.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:54:27 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						759df05bdd 
					 
					
						
						
							
							More language strings, focused this time on the command handler.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:34:12 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						976149743a 
					 
					
						
						
							
							Change some way we let people know of hte language system.  
						
						 
						
						... 
						
						
						
						Also added a console command sender to the test setup, just in case we
want to use it later on down the road. 
						
						
					 
					
						2014-01-14 18:28:02 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						cf7c9fc4c2 
					 
					
						
						
							
							Protect the jails against explosions, if it is enabled  
						
						 
						
						
						
						
					 
					
						2014-01-08 15:27:38 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						d734d99e88 
					 
					
						
						
							
							Protect against block breaking and block placing in jails  
						
						 
						
						... 
						
						
						
						Unless the player has admin permission. This does not include the
penalties as those will be done in a future commit. This also has a
little better performance on the block placing and breaking events, if
these checks are disabled. 
						
						
					 
					
						2014-01-08 15:02:24 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						ab74a158b8 
					 
					
						
						
							
							Get the muted message from the Language File  
						
						 
						
						
						
						
					 
					
						2014-01-04 00:22:26 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						369c874add 
					 
					
						
						
							
							If the config has prisoners not to get the chats, then let's obey that.  
						
						 
						
						
						
						
					 
					
						2014-01-03 23:57:10 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						2f36c1f900 
					 
					
						
						
							
							Fix the broadcast/logging not being the correct one for minutes.  
						
						 
						
						
						
						
					 
					
						2014-01-03 21:05:39 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						906348dc69 
					 
					
						
						
							
							The time reduction works, just use bukkit if you want it to work.  
						
						 
						
						... 
						
						
						
						The other way is to only be used if you have low tps. 
						
						
					 
					
						2014-01-03 20:54:43 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						6f86f04f3d 
					 
					
						
						
							
							Log to the console which timer/scheduler we're using.  
						
						 
						
						
						
						
					 
					
						2014-01-03 20:29:25 -06:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								graywolf336 
							
						 
					 
					
						
						
							
						
						57eb5c71e3 
					 
					
						
						
							
							Nullify the timer on disable  
						
						 
						
						
						
						
					 
					
						2014-01-03 14:18:16 -06:00