JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,823 Commits 1 Branch 0 Tags 481 MiB
6bc8039dbd
Commit Graph

2802 Commits

Author SHA1 Message Date
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
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
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
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
Sam
b51007da91 Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple 2016-06-02 22:28:35 +01: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