EpicKnarvik97/Jail
EpicKnarvik97/Jail
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
495 Commits 1 Branch 1 Tag 1.5 MiB
b91b54a9fc
Commit Graph

469 Commits

Author SHA1 Message Date
graywolf336
34acf4bbaa Work on the commands help and usage, sync with the wiki pages. 2014-07-25 00:10:26 -05:00
graywolf336
cac81f0420 Move clearforce into clear and use -f (-force) to forcefully do it. 
It does still require the permission `jail.command.jailclearforce` and
if it isn't provided then it will fall back to regular clearing.
 2014-07-24 23:29:53 -05:00
graywolf336
1ea60ca106 Fix the confirmation never expiring. 2014-07-24 23:17:20 -05:00
graywolf336
d3a7ef0e9d Add a debug message for the development builds 2014-07-24 23:05:20 -05:00
graywolf336
7b3a085edb Debug how long it took for the entire plugin to enable all the way. 2014-07-24 23:01:10 -05:00
graywolf336
0362dac92d Test the new language system. 2014-07-24 21:17:23 -05:00
graywolf336
1898121643 Simplify the language system and the language calls, also fix the 
language system not copying over the new values when new values were
added.
 2014-07-24 21:16:57 -05:00
graywolf336
709a06f330 Add an API class and also add some testing for it. 2014-07-23 16:39:45 -05:00
graywolf336
59c583e8b3 Rename the TestJailStuff to TestJailDefaultConfig 2014-07-23 14:48:39 -05:00
graywolf336
47fd0d7632 Tiny stuff on the benchmark test. 2014-07-23 14:35:53 -05:00
graywolf336
413abf7244 Test the new util method. 2014-07-23 13:20:21 -05:00
graywolf336
4829a75785 Move the time parsing tests into the util tests, as that's what it 
really is testing.
 2014-07-22 21:39:26 -05:00
graywolf336
b5b79b9704 Move the three jewel unit tests into the rest of the command tests. 2014-07-22 21:35:08 -05:00
graywolf336
6b8dec6c7b Work on some unit tests for #7 and reorganize part of the config. 2014-07-22 20:58:05 -05:00
graywolf336
b63773c7a9 Move the timer to be async if we're using bukkit's timer. 
This should improve the performance of the plugin even more, because it
won't do any database calls while inside the loop which is what was
usually the hang up time.

This is completely untested and possibly could throw tons of errors.
 2014-07-21 19:11:12 -05:00
graywolf336
e4f32559b6 Clean up the formatting of the copied code in the update. 2014-07-21 18:30:39 -05:00
graywolf336
a2d46b8e26 Forgot part of the JavaDoc, whoops. 2014-07-21 18:28:56 -05:00
graywolf336
8b547ed748 Add more jail stick JavaDoc and fix the OBE from previous version of 
jail sticks being used.
 2014-07-21 18:27:40 -05:00
graywolf336
bfd786f650 When we reload the update checking, cancel the previous task. 2014-07-21 18:23:31 -05:00
graywolf336
70b2fbe1e1 Cancel all the tasks for this plugin when shutting down. 2014-07-21 18:20:04 -05:00
graywolf336
1c92f90ccc Update notifications! For dev, stable-dev, and bukkit channels! :) 2014-07-21 18:17:30 -05:00
graywolf336
6fe5eeb346 Move some items around for organization 2014-07-21 15:54:16 -05:00
graywolf336
1181f33693 It is jail createcells not jail cellcreate 2014-07-15 20:19:35 -05:00
graywolf336
fec2fddb26 Remove the default blacklist items..those are precious blocks. 2014-07-15 01:39:04 -05:00
graywolf336
8a7a9cefef Make the jail stick manager/creation smarter and fix jailing via jail 
sticks, as it wasn't working at all.
 2014-07-15 01:05:46 -05:00
graywolf336
d034a0f1ed Fix the error when trying to measure difference between two worlds. 2014-07-15 00:19:13 -05:00
graywolf336
86082e2f63 Allow resisting arrests via the jail stick. 2014-07-15 00:11:36 -05:00
graywolf336
c9b0fc8480 Fix the blacklist not working or sometimes erroring out. 2014-07-14 23:47:36 -05:00
graywolf336
9e0722c218 Remove all of the types from a player's inventory when jailed and an 
item is in their inventory.
 2014-07-14 23:30:37 -05:00
graywolf336
3226515107 Don't allow players to keep their inventory from jail. 2014-07-14 23:28:01 -05:00
graywolf336
720d4c1608 Fix the tests failing. 2014-07-14 23:20:21 -05:00
graywolf336
9ca8e14e29 Add a black list to storing the player's inventory. 2014-07-14 23:16:05 -05:00
graywolf336
a5bf89b07e Don't allow jailing in unloaded worlds and don't allow joining while 
jailed in unloaded worlds.
 2014-07-14 22:53:48 -05:00
graywolf336
5c4122ee92 Fix the unjailing not working, was messed up when we switch to UUIDs 2014-07-14 21:55:01 -05:00
graywolf336
b83d1245f8 Simplify one of our checks on getPrisoner 2014-07-14 21:40:21 -05:00
graywolf336
ce1231da39 Add some debugging code. 2014-07-14 21:38:15 -05:00
graywolf336
27b557991e Add some debugging to the jailing of a player. 2014-07-14 21:19:12 -05:00
graywolf336
049ea63102 Send a message to the unjailer when they unjail someone. 2014-07-14 21:11:46 -05:00
graywolf336
9e1b75c602 Remove the cache object before we release the prisoner. 2014-07-14 21:01:43 -05:00
graywolf336
ba3bbe095b Bukkit likes to be backwards it seems. 
Instead of RGB they do BGR...like seriously!?!?
 2014-07-14 20:45:50 -05:00
graywolf336
0aeaa26d1e Rofl the helmet is called helmet...not boots :p 2014-07-14 20:42:17 -05:00
graywolf336
36be8a89a0 Let's try another color for orange... 2014-07-14 20:38:00 -05:00
graywolf336
978994300d Capitalize the values we get, so we can try to get the data. 2014-07-14 19:28:49 -05:00
graywolf336
2c336527a5 Fix the config containing tabs instead of spaces. 2014-07-14 19:10:44 -05:00
graywolf336
8fe7dea3ae Add limited inmate clothing! Closes Ticket #22 2014-07-14 19:05:28 -05:00
graywolf336
a38ae137ee Add a prisoner death event, closes #28 2014-07-14 18:39:38 -05:00
graywolf336
3912dbfabc Only save the prisoners if they were changed, add that flag. 2014-07-14 18:23:29 -05:00
graywolf336
f3c2772a87 Use BIGINT for the time 2014-07-14 18:07:13 -05:00
graywolf336
f042af4731 Fix the time not being converted correctly. 2014-07-14 18:03:17 -05:00
graywolf336
c7de4364b1 If the world is null, don't return a string of the location. 2014-07-14 17:09:06 -05:00
graywolf336
34ebc5bc08 Update readme and convert the old positions. 2014-07-14 17:01:34 -05:00
graywolf336
48972e9523 Schedule the time decrease for every ten seconds 2014-07-14 16:52:32 -05:00
graywolf336
fe7aabc6ea Very using the new api, some older versions are still used. 2014-07-14 16:39:01 -05:00
graywolf336
88817fb9a2 If the data passed is empty, return an empty inventory. Try to fix the 
latest issue reported in #26
 2014-07-07 14:56:25 -05:00
graywolf336
f2cf051b4e Run the save every minute, instead of every 10 seconds. 
Next up: making mysql async.
 2014-06-12 11:13:55 -05:00
graywolf336
2c971eb9bc Add some JavaDoc explaining what the CacheListener is for. 2014-06-12 11:00:01 -05:00
graywolf336
c6cdd5499e Add a comment to the test. 2014-06-12 10:56:49 -05:00
graywolf336
d535b758d4 Add .gitattributes 2014-06-12 10:50:53 -05:00
graywolf336
a77e0cc472 Performance changes to get better performance on the move protection. 
We now get the cache object inside the move event and get all the other
objects from that. The reason for this is so that we don't have to then
loop through all the prisoners in a jail again to get one prisoner, just
get it from the cache object.
 2014-06-12 10:30:00 -05:00
graywolf336
a442887b36 Telling me something changed but I don't know what. Will revert if it is 
something breaking.
 2014-06-12 10:15:11 -05:00
graywolf336
7ad5fedfd1 Work on the tests and change up some performance issues. 
1. In the player move event we looped through the jailed players more
than once which really is an issue when you have several hundred jailed
and since the move event is called several times a second, that was a
huge performance hit.
2. Don't save the prisoner data as soon as they are jailed, we take care
of that else where with the shutting down and counting down time.
 2014-05-30 15:54:11 -05:00
graywolf336
45bd4ac8c1 Reference the plugin and not Bukkit 2014-05-30 14:28:04 -05:00
graywolf336
74e62be46c Use InputStreamReader when reading the default en.yml from the plugin. 2014-05-30 14:03:20 -05:00
graywolf336
af1fa37470 Add a cache for prisoners online only, this should help performance #26 
The cache listens to a lot of events and custom events to ensure the
cache is up to date, this way we don't have to loop through all the
prisoners in a jail every single time they move or something but instead
just check the cache.
 2014-05-30 12:23:32 -05:00
graywolf336
82f17f3a4b Merge branch 'master' of git@github.com:graywolf336/Jail.git 2014-05-30 11:12:30 -05:00
graywolf336
c5720ec84d Move the handcuffing to store data per uuid. 2014-05-30 11:12:08 -05:00
graywolf336
8cb7a76eeb Fix #27, all scoreboards are managed by UUIDs and no longer names. 2014-05-24 14:20:37 -05:00
graywolf336
3e54d79dd3 Try to lower the amount of time spent on each move event as mentioned in 
issue #26
 2014-05-08 19:30:20 -05:00
graywolf336
0bb679329d Fix the error when saving a cell that has a prisoner. This should fix 
and close #26.
 2014-05-03 09:52:45 -05:00
graywolf336
7db5fe9da5 Attempt to fix the NPE error when loading the old JailPayCurrency 2014-05-03 01:15:00 -05:00
graywolf336
ef5dfe3815 If we have converted data, save everything after JailIO is loaded. 
This might solve #26 but I'm not closing it yet as this is untested.
 2014-05-03 01:12:26 -05:00
graywolf336
42d0e7983f Convert the jailpay settings over. 2014-05-02 01:43:30 -05:00
graywolf336
b3033913c7 Properly output how many cells were loaded, hopefully this has something 
to do with #26 displaying incorrect information.
 2014-05-02 01:35:04 -05:00
graywolf336
b8dc15decb We use player instead of name for the player's last known name. 
Good catch by @dewick on issue #26.
 2014-05-02 01:31:04 -05:00
graywolf336
084e8bea01 Warn when a cell doesn't have a teleport location or cell. Also, don't 
double store a prisoner when they get put in a cell from a jail after
being converted.
 2014-05-01 17:39:48 -05:00
graywolf336
f1dadaaae0 Lookup the records by username and get the UUID ourself. 2014-04-30 13:18:56 -05:00
graywolf336
a7798c9d62 Fix the javadoc on one method in JailIO being incorrect. 2014-04-29 13:24:26 -05:00
graywolf336
4d4f609b82 Finish using the UUID, we are still using blocking methods. 
I want to get fully away from blocking methods and instead make the
user/player/prisoner/whatever wait to get an answer while we retrieve
the uuid information asynchronously.
 2014-04-29 13:20:33 -05:00
graywolf336
ad9c70cbbf Readd the method I removed and also change the cells to uuid. 2014-04-29 10:53:36 -05:00
graywolf336
63e117ac72 Build will fail. Started work on converting to using uuid's internally. 
While doing this I deleted one method that I shouldn't have, so going to
revert that. Next I have to build a method or two which will allow me to
do last known names lookups, etc. Might switch to using a library to
handle getting names async so we don't block the server up, doing this
will result in us having to recode some of the commands internally.

If you have any suggestions or questions, I'm open.
 2014-04-28 23:52:52 -05:00
graywolf336
0981fe659f Correctly log how many prisoners were loaded. 2014-04-28 22:46:41 -05:00
graywolf336
998c7bd824 If we couldn't find a jail from the prisoner, get the first jail. 
Also, don't try to load prisoners if there are no jails.
 2014-04-28 22:27:41 -05:00
graywolf336
cb88948c29 Merge branch 'master' of git@github.com:graywolf336/Jail.git 2014-04-28 20:11:58 -05:00
graywolf336
581a826524 Output out type of storage is selected when not in debugging mode. 2014-04-28 20:11:39 -05:00
graywolf336
5241f917ce Don't double send the message on backwards support for commands. 2014-04-27 00:29:08 -05:00
graywolf336
7167bff981 Fix the NPE when providing backward compabitility. 2014-04-27 00:19:23 -05:00
graywolf336
6c55578062 Try to provide backwards compatibility. 2014-04-27 00:05:35 -05:00
graywolf336
4f7678fed6 Fix the name portion of the prisoners not loading. 2014-04-26 22:29:36 -05:00
graywolf336
7898d3518e Remove extra line there...this is mostly to get jenkins to build again. 2014-04-25 18:09:14 -05:00
graywolf336
821051a3bc Fix the tests failing, happy day! 2014-04-25 17:56:52 -05:00
graywolf336
a3d9a54ff0 First attempt to use UUID, not tested one ounce. 
And I imagine the unit tests are going to fail.
 2014-04-21 22:58:15 -05:00
graywolf336
1de176e67e Don't enable scoreboards by default, they are laggy in the newer bukkit 2014-04-21 22:52:17 -05:00
graywolf336
3ad2eb26af Merge branch 'master' of git@github.com:graywolf336/Jail.git 2014-04-21 22:04:23 -05:00
graywolf336
0ae2956137 Add a command to toggle whether jail is in debugging or not. 2014-04-21 22:04:03 -05:00
graywolf336
caf4315d6c Only initialize JailPayManager if vault exists. 2014-04-01 23:21:24 -05:00
graywolf336
45bd1776ee If Vault is not enabled, don't enable Jailpay. 2014-04-01 23:09:15 -05:00
graywolf336
4ade1bcf38 Implement Jail Pay, this closes #11 2014-03-20 15:33:42 -05:00
graywolf336
126c1576c4 Add the jail name to the scoreboard's title. 2014-03-16 16:13:40 -05:00
graywolf336
fe7cb9f5a5 Add a new command /jail time which has easy access for add/subtract 
time from a prisoner's sentence.

This command could be useful for commandblocks or something else, as it
does not need a player context. This closes Bukkit Dev Ticket:
http://dev.bukkit.org/bukkit-plugins/jail/tickets/432/
 2014-03-15 14:40:50 -05:00
graywolf336
3e3f2d432e Convert the old data to our new data and move the old files. 
Closes #24 but it probably has a few bugs or prisoners who were in cells
are not any more, but I will only fix that if someone pursades me to.
 2014-03-14 17:40:44 -05:00
graywolf336
48fe312193 Really allow there to be more than one jail stick. 2014-03-14 15:52:41 -05:00
graywolf336
2778c79150 Debugging to figure out why more than one stick isn't being loaded. 2014-03-14 15:44:19 -05:00
graywolf336
737a7e35e2 Debugging is important to me, load the old debugging value. 2014-03-14 15:35:50 -05:00
graywolf336
b2a8e6c89c Save the configuration file after we converted items. 2014-03-14 15:30:59 -05:00
graywolf336
1f6881177a Strip the colors from when unjailing and sending the message to console. 2014-03-14 15:22:13 -05:00
graywolf336
c478ef2544 Actually reload the jail sticks when we reload the plugin via command. 2014-03-14 15:20:50 -05:00
graywolf336
2dfe777f3f Actually make a call to move over the old config. 2014-03-14 15:18:36 -05:00
graywolf336
060bb125a4 First work on converting the old global config file to the new one. 
For #23
 2014-03-14 15:15:30 -05:00
graywolf336
065f273c14 Finish the missing JavaDoc for the scoreboard manager. 2014-03-13 13:02:10 -05:00
graywolf336
ec1e91cda2 Implement the usage of Scoreboards, make the language configurable. 
Closes #15
 2014-03-13 12:59:47 -05:00
graywolf336
6ce05dbe7d Regular users don't need to know how many commands are loaded, debug. 2014-03-12 22:45:47 -05:00
graywolf336
816fe1d5b7 Fix the JailHandler containing incorrect JavaDoc. 2014-03-12 22:44:01 -05:00
graywolf336
11d6995cc3 Fix default Jail Stick not loading correctly, closes #21 2014-03-12 22:41:10 -05:00
graywolf336
1399f8d260 Fix some of the JavaDoc. 2014-03-11 13:03:11 -05:00
graywolf336
7d64fce5db Add some debugging code to try and work out #19 2014-03-08 23:59:23 -06:00
graywolf336
74812114c6 Add a record entry when a player is jailed by jail sticks. 
Closes #20
 2014-03-08 23:55:13 -06:00
graywolf336
39cc95b96d The jail stick is now usable. 
Closes #16.
 2014-03-08 23:39:11 -06:00
graywolf336
64c4298cca Whoops, didn't mean to move the database to the wrong config section. 2014-03-08 22:57:33 -06:00
graywolf336
df45b267a7 Okay okay, add the missing files for the Jail Stick for #16. 2014-03-08 22:53:59 -06:00
graywolf336
274f3a03ab Start work on Jail Sticks. 2014-03-08 22:53:31 -06:00
graywolf336
2ec69c5650 Finish adding the jailrecord command, this closes #12. 2014-03-06 18:10:53 -06:00
graywolf336
9f9ede433a Fix a problem with the loading of cells when no signs. 2014-03-06 17:09:21 -06:00
graywolf336
5f6807fc24 Started work on profiling when prisoners get jailed #12. 
This only works for the sql right now, next commit will handle flatfile.
 2014-03-06 16:51:25 -06:00
graywolf336
ac6a5b23cb Some clean up work on the JailIO class. 2014-03-06 14:04:11 -06:00
graywolf336
02a4e206cb Set AutoCommit to true for MySQL. 
Haven't really tested it, so not sure what it does.
 2014-03-06 13:28:58 -06:00
graywolf336
47949a9373 Fix some debugging messages. 2014-03-06 12:14:18 -06:00
graywolf336
4f90a99cd5 Remove cells and prisoners which reference a deleted prisoner. 
For beta purposes, this closed #18 since all the main sql things are
done.
 2014-03-06 12:11:10 -06:00
graywolf336
4ca9ff8b8d No need to have the sql commands outputted anymore on creation. 2014-03-06 11:49:12 -06:00
graywolf336
2027331540 When forcefully removing a prisoner, check for a cell. This closes #17 2014-03-06 11:33:24 -06:00
graywolf336
c249a44f35 More work on loading the prisoners from mysql for #18. 2014-03-06 11:04:04 -06:00
graywolf336
42d25e0b69 Column is cell not cell_n1 2014-03-06 10:40:46 -06:00
graywolf336
725c0fd207 Start some work on loading the prisoners, for #18. 2014-03-05 22:50:53 -06:00
graywolf336
06793330ac Fix the jailing sql syntax being incorrect for jailing in cells. 2014-03-05 22:36:43 -06:00
graywolf336
262f1dc4f9 Finish loading cells and check for chest when we are removing a cell. 2014-03-05 22:28:12 -06:00
graywolf336
3a6a76a86c Try a different way of seeing if a block is a sign on removing of a cell 2014-03-05 22:15:22 -06:00
graywolf336
e0411f1202 Add some sql to remove the prisoner. 
Untested.
 2014-03-05 17:21:54 -06:00
graywolf336
0fabe1ff2e Add some sql to remove the cells and jails. 
Untested.
 2014-03-05 16:56:13 -06:00
graywolf336
295f6061a8 Really allow the chest to be null in cells. 2014-02-21 12:15:44 -06:00
graywolf336
95e9c7c50a Reorganize how we save new cells, this way doesn't dupe cells any more. 2014-02-21 09:32:11 -06:00
graywolf336
d2a6773522 Fix the generation of the sign strings. 2014-02-21 09:23:50 -06:00
graywolf336
bd7397a929 Allow no chest to be selected for the cells when creating it. 2014-02-21 09:22:00 -06:00
graywolf336
1c5bfc24ea Allow the chest to be null for the cells. 2014-02-21 08:59:44 -06:00
graywolf336
8834e193ac Some more work on the MySQL, making slow progress for #18. 2014-02-20 21:51:36 -06:00
graywolf336
2458b75f84 Forgot to handle the error when thrown. 2014-02-20 21:32:45 -06:00
graywolf336
7f79f82636 Let's try to load a jail from MySQL, #18. 2014-02-20 21:29:29 -06:00
graywolf336
1b2ed8bec4 We'll use replace into and not insert into, #18. 2014-02-20 21:07:06 -06:00
graywolf336
b26fed8f80 Fix the insertion of the prisoners. 2014-02-20 21:03:17 -06:00
graywolf336
75aec51dc2 Let's try to save the jails with MySQL, first attempt #18. 2014-02-20 20:55:04 -06:00
graywolf336
5e6fecfef8 Add the creation of tables sql, if the sql is mysql. #18 
sqlite will be last on my list, might move it into beta 3.
 2014-02-20 16:20:27 -06:00
graywolf336
356fab682e Start some initial work on the sql portion, no where near close. #18 2014-02-19 21:54:56 -06:00