Commit Graph

1702 Commits

Author SHA1 Message Date
Keir
03a5954224 Handle saving and loading of the ShowUserReports setting. 2015-11-09 18:35:03 +00:00
Keir
fd2a543418 Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently).
Fix variable names in ReportManager.
2015-11-06 16:46:10 +00:00
Keir
0c0b3708c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-06 01:34:13 +00:00
Keir
e449e47b9a Document ReportNotification. 2015-11-06 01:33:46 +00:00
Keir
72b650086d Instantiating a page shouldn't cause it to automatically open. 2015-11-03 17:03:09 +00:00
Keir
bd6ce21cf7 Make use of foreign keys in table creation and drop "INDEX" statements (foreign keys are auto-indexed). 2015-11-03 16:40:31 +00:00
Keir
6054bfaac4 Do all database operations asynchronously. 2015-11-03 15:37:39 +00:00
Keir
9030b4f264 Remove unused column 'date'. 2015-11-03 15:27:32 +00:00
Keir
95c38b1939 Don't use static instances. 2015-11-02 23:30:06 +00:00
Jonathan Williams
8838ea75e4 Some code cleanup for tasks. 2015-11-02 09:37:11 -06:00
Jonathan Williams
3b38302429 Optimized TaskManager task locks and calls.
Run all player messages on the main thread.
2015-11-02 09:35:35 -06:00
Jonathan Williams
55d028d706 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-01 22:09:58 -06:00
Shaun Bennett
9cf62cfe7f Don't use player skulls until caching is setup and working properly 2015-11-01 22:58:22 -05:00
Jonathan Williams
cb96124feb Added extra cleanup for FriendsGUI and AddFriendPage 2015-11-01 17:42:23 -06:00
Keir
4b5ddf5385 Disable SQL create table queries until they are approved. 2015-11-01 19:14:29 +00:00
Keir
d09ed2a823 Small changes and missed changes from last commit. 2015-11-01 16:47:54 +00:00
Keir
93a5ebf0eb Pass server name to ReportManager. 2015-11-01 16:44:02 +00:00
Jonathan Williams
073321fb14 Refactored TrickOrTreat Stuff. 2015-10-31 14:45:42 -05:00
Cheese
b8b260bca1 fixed expire time on projectiles 2015-10-31 19:01:49 +11:00
Cheese
c463b80fe0 fixed insta-expire 2015-10-31 19:00:28 +11:00
Cheese
3636fdfba0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-31 18:23:06 +11:00
Cheese
225f067ab3 fixed some projectile stuff 2015-10-31 18:22:53 +11:00
Shaun Bennett
cd15df0238 Merge remote-tracking branch 'origin/master' 2015-10-31 02:13:24 -04:00
Cheese
23be8aa1dd removed unncessary stuff
balanced rewards
2015-10-31 14:33:41 +11:00
Cheese
a92a52f009 Merge branch 'Myst_TRICKORTREAT' 2015-10-31 14:27:06 +11:00
Mysticate
4884032a1a Added a beautiful Trick o' Treat system for the hub. Happy Halloween! <3 2015-10-30 23:24:32 -04:00
Cheese
b9d7c80f80 cow kit 2015-10-31 13:25:57 +11:00
Cheese
c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
Keir
ec5cbbe684 This method is not required, "Plugin" is protected, not private as I previously assumed. 2015-10-30 01:05:45 +00:00
Keir
e266acaf44 Store report categories with a TINYINT to save space and increase lookup performance. 2015-10-29 23:33:23 +00:00
Keir
e8c01a1733 Cleanup imports. 2015-10-29 23:29:38 +00:00
Keir
1857afa826 Log report category to database.
Allow report to easily be handled by clicking text to fire the reporthandle command.
2015-10-29 17:51:17 +00:00
Shaun Bennett
e2947718fe Remove code that wasnt meant to be commited 2015-10-29 13:10:10 -04:00
Keir
dd321439a6 Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-10-27 22:40:23 +00:00
Keir
4ceb8f20aa Make ReportNotification capable of sending json messages. 2015-10-27 22:26:02 +00:00
Keir
cb1c779f37 Close player report if the reported player leaves the game mid-report. 2015-10-27 22:15:06 +00:00
Keir
d9fb0adabb Only notify staff if 3 or more players report a player. 2015-10-27 22:14:33 +00:00
Keir
53f2356cba Handle null report closers. 2015-10-27 22:08:42 +00:00
Keir
bc3a119a22 Store report category and only "merge" reports when the category is the same. 2015-10-27 17:30:47 +00:00
Shaun Bennett
556d5adcd9 Change /global to /globalpacket (fixes conflict with announcement command) 2015-10-24 17:46:25 -04:00
Shaun Bennett
0d56eefd44 Titan/Rewards adjustments 2015-10-24 13:40:17 -04:00
Keir
394e501682 Merge branch 'master' into feature/report
# Conflicts:
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-10-24 17:50:26 +01:00
Keir
a9fedecc70 Make the ui more appealing and use existing gui system to handle it. 2015-10-24 17:10:50 +01:00
Keir
29587b93f7 Implement initial report interface.
Added getPlugin() method to CommandBase.
Changed mini-plugin name from "ReportPlugin" to "Report" to match the other mini-plugins.

This is very WIP, still a lot to be done.
2015-10-24 03:41:03 +01:00
Shaun Bennett
40afcaf26b Global Packet Commands 2015-10-23 15:07:53 -04:00
Cheese
af208da953 Merge branch 'alex-testrank' 2015-10-23 18:10:59 +11:00
Shaun Bennett
e3e7dd4694 Titan rewards from mythical chests 2015-10-23 02:08:31 -04:00
AlexTheCoder
1512d87f9e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank 2015-10-23 00:28:32 -04:00
Jonathan Williams
c719d693dd Added delete benefit call for repository.
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
2015-10-21 01:15:09 -05:00
Jonathan Williams
3ef33bd9c5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-10-19 01:32:23 -05:00