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

407 Commits

Author SHA1 Message Date
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
graywolf336
e54dbc8a8c Fix the spacing on the listcells 2014-02-16 16:53:41 -06:00
graywolf336
399b8662e5 jailstop is now /jail stop 2014-02-16 16:28:09 -06:00
graywolf336
43eb68811b Create cell is not createcells 2014-02-16 16:05:42 -06:00
graywolf336
ac2c99eac3 Throw the PrisonerTransferredEvent after a player is transferred, #9. 2014-02-15 01:01:48 -06:00
graywolf336
7af47bd2e0 Fix some JavaDoc 2014-02-15 00:58:48 -06:00
graywolf336
620c57cdc9 Add a PrePrisonerTransferredEvent #9. 2014-02-15 00:52:25 -06:00
graywolf336
d049dba447 Default the cancelled to false. 2014-02-15 00:16:52 -06:00
graywolf336
b9d6fafac7 Fix the JavaDoc being incorrect on the setJailer 2014-02-15 00:14:54 -06:00
graywolf336
22f2b66cf5 Add the PrePrisonerReleasedEvent for #9, not all that useful event tbh. 2014-02-15 00:05:32 -06:00
graywolf336
d0763b6c00 Add the PrisonerReleasedEvent for #9. 2014-02-14 23:58:17 -06:00
graywolf336
5f39776825 Fix the issue in the config which was causing the tests to fail. 2014-02-14 23:53:06 -06:00
graywolf336
c84b833ebb Add the PrisonerJailedEvent, mark it off #9. 2014-02-14 23:50:23 -06:00
graywolf336
2684fa9bd4 Transferring of prisoners to different jails works, finalizes #5. 2014-02-14 23:38:13 -06:00
graywolf336
47fba5ab79 Allow /jail status and also send them a message when they check it 2014-02-14 23:34:41 -06:00
graywolf336
3784eb6b28 Fix the confirm not working. 2014-02-14 23:18:41 -06:00
graywolf336
c432dee86f Register the #3 confirm command, that was a funny fail on a test. 2014-02-14 21:59:28 -06:00
graywolf336
e148e1e2dd Fix an NPE with the confirmation for #3, oversight on my part. 2014-02-14 21:42:27 -06:00
graywolf336
52456edc6b Finish up the confirmations for #3. 2014-02-14 21:37:39 -06:00
graywolf336
82a40c5d8e Add the confirmation to the clearforce command, continued work on #3. 2014-02-14 18:02:08 -06:00
graywolf336
54bea41d05 Further work on #3, lots of logic work figured out. The clear command 
uses the confirmation method now, just need to test it.
 2014-02-13 13:40:23 -06:00
graywolf336
f6686fee8d Start work on #3, confirming before deleting something major. 2014-02-13 13:02:44 -06:00
graywolf336
2036a311ac Remove the removing cell command, that is replaced with jaildeletecell. 2014-02-13 13:02:15 -06:00
graywolf336
efcd517360 Add the /jail status command. 2014-02-13 12:00:21 -06:00
graywolf336
78cc20c2c1 Add the removing of a jail via the ``/jail delete`` command. 2014-02-13 11:26:42 -06:00
graywolf336
950eb638b8 Add the command to transfer all the prisoners in one jail to another. 2014-02-12 15:52:10 -06:00
graywolf336
b1ca15d10c Jail check is now for one player only, use jail list <jail> for all. 2014-02-12 15:35:29 -06:00
graywolf336
94111955a4 Add deletecell and deletecells. 
The deletion of cells is very spammy, might have to change later on down
the road.
 2014-02-12 15:31:02 -06:00
graywolf336
3dc89a60c8 For real fix the no cell message, this is why testing is so important. 
I forget things and forget to type something or mistype something.
 2014-02-12 13:53:36 -06:00
graywolf336
5256f05fe3 Fix the no cell found message not being correct. 2014-02-12 13:48:45 -06:00
graywolf336
f774bf335f Send a message to the sender when they transfer someone...hehe whoops. 
This finalizes the development piece of #5, just need to test it.
 2014-02-12 13:42:45 -06:00
graywolf336
65f4f47cca Convert the transfer jewel using args to arguments, removing 'transfer' 2014-02-12 13:27:22 -06:00
graywolf336
c6988edd4f Check for null on the transfer arguments. 2014-02-12 13:14:32 -06:00
graywolf336
30b148f7ca Don't use the actual args but instead use our faked arguments. 2014-02-12 13:05:21 -06:00
graywolf336
5acfa351d2 Params are not empty any more but null. 2014-02-12 12:58:23 -06:00
graywolf336
bf6bbb16f6 Add a couple tests which test the jewel system. 2014-02-12 08:39:29 -06:00
graywolf336
87bb9feecb Make all the arguments optional on the transfer, we handle that ourself. 
This way we handle it ourself for language purposes.
 2014-02-11 20:46:23 -06:00
graywolf336
48a7435fbe Fix the tests failing and also fix the jail command not doing anything. 2014-02-11 20:44:19 -06:00
graywolf336
58bc007b3e Remove all reference to jcommands and use jewelcli. 
This commit also cleans up the jail command to be quicker as the old way
I was doing it just didn't work nor was it good to go for production.
This method also utilizes the CommandInfo's pattern to match
subcommands, like it was meant to be used for. Completely untested.
 2014-02-11 20:34:35 -06:00
graywolf336
e078f73d3c Testing out another command parser. 
This one seems like it will be good, but there appears to be a bug with
it sadly. https://github.com/lexicalscope/jewelcli/issues/28
 2014-02-10 16:42:59 -06:00
graywolf336
b9f01dd599 Remove extra space and add mins after the minutes 2014-02-10 15:10:22 -06:00
graywolf336
d8611a51bc Add the missing space between jailer and remaining time 2014-02-10 14:56:25 -06:00
graywolf336
96a58aa3df Fix the header being incorrect when listing prisoners 2014-02-10 14:55:16 -06:00
graywolf336
7ce81c774f Send a message when there are no prisoners in a jail. 2014-02-10 14:50:41 -06:00
graywolf336
508366468a List all the prisoners in a jail if the jail is provided on /jail list 2014-02-10 14:40:27 -06:00
graywolf336
05695ce969 Tell the sender the player's name they sent back if already jailed. 2014-02-10 14:06:22 -06:00
graywolf336
e34c1d0990 Allow usage of -p jail players who's names are subcommands. 
/jail -p version -r Having a strange name.
 2014-02-10 13:35:43 -06:00
graywolf336
0f2ff60db7 Change the debugging messages to use the new debug method. 2014-02-10 13:29:30 -06:00
graywolf336
25a6d010ac Add some JavaDoc to the transfer method. 2014-02-10 12:37:57 -06:00
graywolf336
2ecb26dc8a After we've transferred them on joining, don't leave that flag there 2014-02-04 13:34:00 -06:00
graywolf336
d0312afc66 First attempt at working on the transferring of prisoners 2014-02-04 13:30:12 -06:00
graywolf336
d0e41ed908 Add the unjailforce command 2014-02-03 18:44:38 -06:00
graywolf336
b1f4b7bb41 Relocate the move protection so that we only register it if enabled. 
This way we save on a tiny bit of performance when it is disabled.
 2014-02-01 11:52:50 -06:00
graywolf336
683b4457f4 Fix the messages not being correct. 2014-02-01 01:56:12 -06:00
graywolf336
7c4c403843 Fix the jail command, it will always reach here with one argument. 2014-02-01 01:43:54 -06:00
graywolf336
e52a24cb5e Add some debug to the JailHandler 2014-02-01 01:39:39 -06:00
graywolf336
0bb25e6324 Fix the tests failing 2014-02-01 01:28:33 -06:00
graywolf336
a088577bee Move lots of the subcommands to proper place, let's see if this works. 2014-02-01 01:24:44 -06:00
graywolf336
989e503242 Add the ver to the version command. 2014-01-30 14:34:55 -06:00
graywolf336
bfebd6e944 Fix some of the commands not working, let's hope this doesn't mess up. 2014-01-30 14:29:26 -06:00
graywolf336
f4e735eda4 Fix the jail stop and also add some alternatives. 2014-01-30 14:23:50 -06:00
graywolf336
1e632017c7 Add the jailstop, jailtelein, and jailteleout to subcommands. 2014-01-30 14:10:51 -06:00
graywolf336
edb563a9ec Move mute, reload, and version to the subcommand of /jail 2014-01-29 13:46:26 -06:00