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

7847 Commits

Author SHA1 Message Date
Keir Nellyer 71a4b601e5 Some work on getting the chatsnap site to read from the database 2016-06-19 22:21:12 +01: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
TadahTech d16f83af00 Attempt to fix duplicate messages bug. I cannot reproduce in testing. 2016-06-16 21:12:17 -05:00
cnr 16f6d75dea Revert kit name changes 
We can change this back whenever we've migrated to the new name in mssql
 2016-06-16 20:36:33 -05:00
TadahTech 3dc93e5c8f Fix rare GUI reported bug. 2016-06-16 19:46:31 -05:00
TadahTech 2e0965a064 Fix Infestor kit 
Fix rare occurrence of players getting a GUI they shouldn't (reported)
 2016-06-16 19:45:36 -05:00
TadahTech e28d411ee4 Fix evolution not progression. 
Fixed incorrect description in Gladiators
Reformatted kits in Bridges
 2016-06-16 18:39:37 -05:00
samczsun 1893e98036
Don't run chat filtering on the main thread 2016-06-16 16:39:43 -04:00
samczsun 01409af5bd
Fix misc bugs 
Change UtilServer to return proper plugin instance
Remove /energyshop debug command
Add warning for opening chests while in vanish
Fix item maps being broken
Fix tutorials possibly wiping inventory
Make the project compile
 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
TadahTech e7d76e2ef4 Hot fixes. 2016-06-16 03:56:32 -05:00
samczsun d6d8d288ca
Prevent TNT duping in Bridges. Fixes PC-132 2016-06-15 22:10:43 -04:00
samczsun 5c2a9d5807
Prefixes are too long or something 2016-06-15 21:52:25 -04:00
samczsun 2d8b7f4ecd
Cleanse lore 2016-06-15 21:52:25 -04:00
samczsun 18d7eba9db
Let's not eagerly delete clans 2016-06-15 21:52:25 -04:00
samczsun 5564b07a36
Remove unnecessary serializations 2016-06-15 21:52:25 -04:00
samczsun 9933345a7b
Remove debug messages 2016-06-15 21:52:25 -04:00
samczsun 67f4361959
Cleanup CustomItems after a while 2016-06-15 21:52:25 -04:00
samczsun 1e5d91e392
Make porting from old legendaries work, fix null commandcenter 2016-06-15 21:52:25 -04:00
samczsun d49ce27a1b
Make GearShop work again 2016-06-15 21:52:25 -04:00
samczsun 808e506911
Revert "Revert "Clans optimizations"" 
This reverts commit 25a315ac05.
 2016-06-15 21:52:25 -04:00
samczsun 45e6cb902f
Save changes 2016-06-15 21:52:25 -04:00
samczsun a753a3ab07
Clean up legendary code 2016-06-15 21:52:25 -04:00
TadahTech 27afd3d96c Kit progression update 2016-06-15 15:54:53 -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
cnr 06cee364fc Merge branch 'mopple' into develop 2016-06-10 14:12:07 -05:00
Sam 739fcdc649 Fixes the problem where players could not fire a bow in OITQ 
Users with high latency were not able to fire bows.
 2016-06-10 16:29:27 +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
Shaun Bennett 35e1c2af65 Use rewardCoinsLater for giving shards 2016-06-09 18:19:22 -05: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
xXVevzZXx f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -05: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