Keir Nellyer
ef0c3721d8
Micro-optimisation since this ArrayList will only ever hold a maximum of 2 items
2016-06-21 17:47:44 +01:00
Keir Nellyer
b46f08938e
Implement age decay algorithm as supplied by @alexthecoder
2016-06-21 17:46:52 +01:00
Shaun Bennett
1c1912b92a
Update fountain goals again
2016-06-20 00:52:33 -05:00
Shaun Bennett
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
Shaun Bennett
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
Shaun Bennett
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
Keir Nellyer
b4f10531cb
Merge branch 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-19 22:46:19 +01:00
Keir Nellyer
2cfb84eece
Shorten some code
2016-06-19 22:46:06 +01:00
Keir Nellyer
ec2ec878e8
Message type id mapping in preparation for storing chat messages in database
2016-06-19 22:28:56 +01:00
Shaun Bennett
38058bc670
Confirmation Paging
2016-06-19 05:49:32 -05:00
Shaun Bennett
2f0a559441
Add reload command, change podium to lime dye, change tip message
2016-06-18 14:41:32 -05:00
Keir Nellyer
f34c65111b
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-18 00:48:00 +01:00
Shaun Bennett
5f9a57b7e2
Lower booster tip cooldown to 1 minute
2016-06-17 16:10:01 -05:00
Shaun Bennett
4e3062f413
Swap Cosmetic and Booster interface slot
2016-06-17 15:23:53 -05:00
Shaun Bennett
0873ee0116
Show entire booster queue in booster gui
2016-06-16 16:54:54 -05:00
samczsun
1893e98036
Don't run chat filtering on the main thread
2016-06-16 16:39:43 -04:00
TadahTech
5ac6249684
Fix Bridges Kits not getting their items.
...
Fix Kits breaking at Level 5
2016-06-16 15:34:23 -05:00
Shaun Bennett
ea551182b6
Make booster gui smaller
2016-06-16 15:29:05 -05:00
TadahTech
e7d76e2ef4
Hot fixes.
2016-06-16 03:56:32 -05:00
samczsun
1e5d91e392
Make porting from old legendaries work, fix null commandcenter
2016-06-15 21:52:25 -04:00
Shaun Bennett
cbfbd6fe1c
Booster GUI update
2016-06-15 17:40:20 -05:00
TadahTech
27afd3d96c
Kit progression update
2016-06-15 15:54:53 -05:00
Shaun Bennett
aa785ed3d5
Code clean-up and documentation
2016-06-12 21:18:11 -05:00
Keir Nellyer
6bc8039dbd
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-11 14:04:43 +01:00
Keir Nellyer
ed50e09a6e
Fix issue an old un-closed but expired report may be re-opened and cause issues
2016-06-11 13:59:53 +01:00
Keir Nellyer
197acee4ae
Implement server weighting
2016-06-11 13:47:45 +01:00
Shaun Bennett
cf87469400
Fix a possible NPE, use proper IP and port for api
2016-06-10 20:24:22 -05:00
Shaun Bennett
2421fd1cfe
Update booster page, proper booster rewards
2016-06-10 19:40:27 -05:00
Shaun Bennett
42c35063b3
Display all the boosters you have activated
2016-06-10 17:40:59 -05:00
Shaun Bennett
6964b1f266
Booster gui command
2016-06-10 17:20:23 -05:00
Shaun Bennett
e6920b4549
Work on booster gui, display wait time
2016-06-10 17:17:43 -05:00
Shaun Bennett
ceb4de8b35
Load booster groups for arcade
2016-06-10 16:33:53 -05:00
Shaun Bennett
0a204a3b90
Use redis pub/sub to send booster updates
2016-06-10 12:44:27 -05:00
Keir Nellyer
a73e1c24b5
Properly calculate user reputation
2016-06-10 15:47:59 +01:00
Keir Nellyer
380139477c
Reduce expiry time for reports
2016-06-10 12:59:50 +01:00
Keir Nellyer
36f47b7067
Clear report cache when report is closed
2016-06-10 12:41:02 +01:00
Keir Nellyer
09009c352b
Remove new-line in query
2016-06-10 12:34:23 +01:00
Keir Nellyer
2cacdbae34
Use more robust Guava Cache class for caching
2016-06-10 12:33:46 +01:00
Shaun Bennett
e30cd6747b
Increase goal 10 million, probably need to change later
2016-06-09 23:40:58 -05:00
Shaun Bennett
1d365d726c
brawl fountain now displays proper info on the weekend
2016-06-09 23:40:58 -05:00
Shaun Bennett
08e47b4b1b
Enable tips in bonus gui
2016-06-09 22:41:41 -05:00
Keir Nellyer
4503f12738
Implement report caching
2016-06-10 00:28:07 +01:00
Keir Nellyer
22dbcbf90d
Move util method to sequence CompletableFuture's to new class 'UtilFuture'
2016-06-09 23:41:17 +01:00
Alex-The-Coder
77e9de0f8f
Update required rank in
...
fountain add help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder
0306f1d703
Update required rank in
...
booster command help message
2016-06-09 17:02:00 -05:00
Alex-The-Coder
dbe8f39eeb
Update required rank in
...
add booster help message
2016-06-09 17:02:00 -05:00
Keir Nellyer
fe06fba406
Re-word from "hacking" to "guilty" so that button is applicable for both types of reports
2016-06-09 22:49:04 +01:00
Keir Nellyer
ad17c620b7
Fix sql query for fetching report result counts
2016-06-09 22:48:18 +01:00
Keir Nellyer
e24d67ecd3
Report errors when fetching a ReportProfile and attempt to recover from it
2016-06-09 18:11:38 +01:00
Keir Nellyer
f0da319f46
Inventories must be handled on the main thread
2016-06-09 18:00:15 +01:00
Keir Nellyer
1db1257a05
Report message task for handler now checks if the report is still active
...
Due to recent changes, this no longer needs to run asynchronously as the CompletableFuture class already makes thing asynchronous for us.
2016-06-09 17:45:08 +01:00
Keir Nellyer
5d9a317f2a
Fix sql queries which use reserved words
2016-06-09 17:06:44 +01:00
Keir Nellyer
e113b0744d
Fix incorrect column name when getting report reasons
2016-06-09 17:06:09 +01:00
Keir Nellyer
9dbef26b92
Fix small typo in comment
2016-06-09 16:34:18 +01:00
Keir Nellyer
8e48b00264
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-09 15:16:38 +01:00
cnr
ba319599ba
Fix fountain schematic file paths
2016-06-09 01:18:09 -05:00
Shaun Bennett
91f6ddce55
Add some minor documentation
2016-06-09 00:48:44 -05:00
Shaun Bennett
611cb28d1a
Fix a typo
2016-06-09 00:47:03 -05:00
Shaun Bennett
cade7b4081
Remove got boosters message
2016-06-09 00:43:59 -05:00
Shaun Bennett
d6bce63967
Use schematics from update folder
2016-06-09 00:43:03 -05:00
Shaun Bennett
ece08c23a9
Fix merge issues
2016-06-09 00:40:05 -05:00
Shaun Bennett
699b35995f
Merge remote-tracking branch 'remotes/origin/develop' into feature/gems
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
2016-06-09 00:39:39 -05:00
Shaun Bennett
d4ac309daa
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
2016-06-09 00:29:27 -05:00
Shaun Bennett
85829d355d
Fix command permissions
2016-06-09 00:25:54 -05:00
Shaun Bennett
22bb56dfda
Remove game booster button
2016-06-09 00:22:54 -05:00
Shaun Bennett
09d2c00f66
Proper display of extra gem fountain rewards
2016-06-09 00:14:01 -05:00
cnr
cf6e3cf05d
Merge branch 'feature/game-variants' into develop
2016-06-08 22:47:16 -05:00
Shaun Bennett
c9d5b91c52
Proper booster activation events
2016-06-08 19:22:25 -05:00
Shaun Bennett
37a412f1bf
Starting to merge boosters into arcade code
2016-06-07 17:24:24 -05:00
Sam
298c09ab82
Lowercase rank prefixes in tablist when in party
...
When in a party the rank prefix in the tablist of every user is now
uppercase.
2016-06-06 20:45:07 +01:00
LCastr0
2410151371
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-05 17:46:27 -03:00
LCastr0
cb71bf4ba5
Removes morphs from gadget persistence (PC-429)
2016-06-05 17:44:34 -03:00
Sam
2755543686
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-05 15:32:06 +01:00
cnr
8de5280241
Disable /allowCmd
2016-06-04 22:55:15 -05:00
Sam
c01b6da390
Staff is incognito could be found using /stats (PC-Bugs-407)
...
Fixes an issue where players could do /stats <name> to find out if
vanished players were on their server.
2016-06-03 13:14:54 +01:00
LCastr0
c5cbca3ed0
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-02 18:30:22 -03:00
Sam
b51007da91
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-02 22:28:35 +01:00
LCastr0
b3291476cb
Changed method names
...
Changed kit modifiers to be in an enum instead of creating a new class for each modifier
Implemented kit modifiers in the games
Removed renaming from Widder, Christmas Elf and Pumpling
Changed the persistence to have the system that Connor added
2016-06-02 18:25:16 -03:00
cnr
894b7db18e
Remove remaining fake ultra tag artifacts
2016-06-02 02:25:15 -05:00
Keir Nellyer
9465ab40ab
Fix sql query for fetching name of user account
2016-06-01 16:51:22 +01:00
Sam
936eb1b978
Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple
2016-06-01 15:41:22 +01:00
cnr
750120c106
Prevent developers from using /punish
2016-06-01 00:47:22 -05:00
cnr
84853a1f9a
Revert "Update chat-spam message with coupon link"
...
This reverts commit dfbb4dca11
2016-06-01 00:39:44 -05:00
cnr
825839d853
Fix PlayerKeyValueRepository's exception and return types
2016-06-01 00:38:29 -05:00
Sam
6cb275e036
PC-121
...
Changed 'a' to 'an' in the text component of the friend menu
2016-05-31 14:44:18 +01:00
Shaun Bennett
4e9a48ab4f
Finish off the tip system
2016-05-30 12:02:12 -05:00
Shaun Bennett
e380354bad
Refactor CurrencyType
2016-05-29 16:34:21 -05:00
Keir Nellyer
01855ba1ce
Some small changes to the reporting system after some very shallow
...
initial testing has been done
Improve exception handling (so we actually get a stacktrace if
something goes wrong).
Check if users can report before showing the category gui.
Tell user if the report failed (due to some sort of internal error).
Correctly get the id of a report when inserting into the database for
the first time.
Shorten some lambdas by using method references.
Remove some unused imports.
Small variable name changes.
2016-05-29 02:45:24 +01:00
Keir Nellyer
55392eae97
No need for 'this' keyword here
2016-05-29 01:10:42 +01:00
Keir Nellyer
075c2d21e9
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-05-29 00:27:48 +01:00
Keir Nellyer
20038f9e64
Massive changes made to how the report feature functions
...
Re-enabled report feature (merge from develop disabled it).
Moved reports from Redis to MySQL.
Made everything asynchronous.
Many many other miscellaneous changes.
Bugs will now be worked out and then this should be ready for QA testing
2016-05-29 00:25:26 +01:00
Shaun Bennett
a1437a3044
Starting to add gui logic
2016-05-28 11:23:26 -07:00
Shaun Bennett
aebcfc2727
Booster tip system
2016-05-28 09:21:10 -07:00
Shaun Bennett
e00009a6d1
Fix CustomTagFix applying to holograms under certain conditions
2016-05-28 09:20:33 -07:00
cnr
dfbb4dca11
Update chat-spam message with coupon link
2016-05-27 13:18:07 -05:00
LCastr0
255191f01a
Changed gadget persistence to use Player Key/Value system (Thanks to Connor)
...
Changed the method names for some classes
2016-05-26 23:58:36 -03:00
samczsun
f1f464f3a4
Change listener priority again. Fixes PC-209
2016-05-26 14:29:13 -05:00
Keir Nellyer
ad486a7e22
Merge remote-tracking branch 'origin/develop' into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportCategory.java
2016-05-26 13:24:24 +01:00
cnr
1c66c10293
Don't create backing tables on startup
2016-05-25 17:59:21 -05:00
cnr
5331e2bec9
Allow PlayerKeyValueRepository Exceptions to propagate
2016-05-25 17:59:20 -05:00
