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

7153 Commits

Author SHA1 Message Date
Conrad
d0d2de1e21 Revert "Report system (version 1)" 2016-04-30 14:53:59 -04:00
Conrad
e0e30a8b7f Merge pull request #43 from Mineplex-LLC/alex-mcl 
Fix Async Elo Ranked Bans
 2016-04-30 14:46:49 -04:00
AlexTheCoder
37a815d52a Update JavaDocs to fit Mineplex standard 2016-04-30 14:41:28 -04:00
AlexTheCoder
2e4bae6915 Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-30 14:14:14 -04:00
AlexTheCoder
2dc5c46624 Fix naming convention on checkRankBannedAsync 2016-04-30 14:13:21 -04:00
AlexTheCoder
41e26f283c Fix all async elo ranked ban methods and switch to callback system for API hooks 2016-04-30 14:10:09 -04:00
TadahTech
6e35bc0989 Stop spamming the chat. 2016-04-30 00:55:59 -05:00
Keir Nellyer
2490e3df82 Previous git merge cause this single line to be deleted 
I literally have no idea why or how this happened.
 2016-04-29 23:47:01 +01:00
Keir Nellyer
6a00f26d5f Merge branches 'develop' and 'feature/report' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2016-04-29 23:42:27 +01:00
Keir Nellyer
81cebc4ce7 Swap static helpers for a much better solution 
This allows for easier refactoring in the future when we move away
from retrieving the CoreClientManager from a static instance.

Mineplex coding standards are also against the use of static helpers
in scenarios such as this, therefore this commit brings this branch
to be in-line with the coding standards.
 2016-04-29 23:37:40 +01:00
AlexTheCoder
a8d9745320 - Fixed order of Top Elo 2016-04-29 00:12:25 -04:00
TadahTech
26f6a1189f Prettyfy EloCommand 2016-04-28 21:34:43 -05:00
TadahTech
e83e4b270c Prettyfy EloCommand 2016-04-28 21:34:07 -05:00
TadahTech
00efb7d72e Fix ELO query 2016-04-28 21:20:48 -05:00
TadahTech
84ca13c0d3 Fix ELO query 2016-04-28 21:09:28 -05:00
TadahTech
80ea7b7a4c Fix ELO query 2016-04-28 21:09:07 -05:00
TadahTech
5a4f89b484 Fix ELO query 2016-04-28 21:04:07 -05:00
AlexTheCoder
7c279998ec - Changed top elo queries 2016-04-28 21:55:51 -04:00
AlexTheCoder
8e68d62356 - Added documentation for new EloManager methods 2016-04-28 21:16:18 -04:00
AlexTheCoder
2887630cf8 - Added javadoc headers 2016-04-28 21:11:38 -04:00
AlexTheCoder
4b7684da4c Merge branch 'feature/top-elo' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla 2016-04-28 21:05:56 -04:00
AlexTheCoder
e032b81842 - Made SQL calls async 2016-04-28 20:59:49 -04:00
TadahTech
562e950361 Remove File headers. 2016-04-28 19:46:13 -05:00
TadahTech
680e579223 Merge Alex's branch into mine. 
Convert to Java 8
Remove unneeded comments.
 2016-04-28 19:39:24 -05:00
TadahTech
168483a9fc Communities work 2016-04-28 19:30:05 -05:00
TadahTech
725481f310 Top Elo data for Webpage 2016-04-28 19:23:57 -05:00
TadahTech
84c0b1b389 Top Elo data for Webpage 2016-04-28 19:22:45 -05:00
AlexTheCoder
156982460f - Fixed water permanently [MCL] 
- Fixed team balancing [MCL]
- Fixed overjoining [MCL]
- Changed bans for quitting ranked matches [MCL]
 2016-04-28 20:03:09 -04:00
AlexTheCoder
b105ccb5f1 - Change event priority 2016-04-28 17:48:16 -04:00
AlexTheCoder
b13528ed66 - Further blockage of creating source blocks [MCL] 2016-04-28 17:46:57 -04:00
AlexTheCoder
3f9ef24235 - Removed debug message 2016-04-28 17:44:37 -04:00
William Burns
5d1194192d Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site 2016-04-28 18:19:45 +01:00
Keir Nellyer
bff5751691 Remove very last @author tag 2016-04-28 14:41:44 +01:00
AlexTheCoder
dcd376b837 - Improved graphics for Elo display in /stats 2016-04-28 01:01:14 -04:00
AlexTheCoder
189296a586 - Fixed using water in restricted zones in MCL 
- Implemented Elo in /stats menu
 2016-04-28 00:53:04 -04:00
AlexTheCoder
46f873634e - Decrease time till Overtime in MCL 
- Block ability to flood in MCL
 2016-04-28 00:33:36 -04:00
AlexTheCoder
b4c5be81f3 - Fixed random weather in MCL 
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
 2016-04-27 23:12:38 -04:00
William Burns
d90e9e7dff Add a system for allowing all players to use game commands when in the correct mode. 2016-04-27 20:54:52 +01:00
William Burns
b8d12c0c9d Small wording changes. 2016-04-27 20:04:36 +01:00
AlexTheCoder
a16145479e - Disabled picking up lava 
- Leaving ranked matches temp bans players from rejoining them
 2016-04-27 03:18:44 -04:00
Keir Nellyer
949f9ca712 Don't allow players to report themselves 
I left this to last minute to make testing easier, as with this check
 in place it means at least two players are required to test the report
 mechanism.
 2016-04-24 18:10:01 +01:00
Keir Nellyer
96aa5d1c4b Removed duplicate code 
Somehow this got duplicated and so therefore was causing compile time
 errors, might have been something to do with my git merge.
 2016-04-24 17:22:21 +01:00
Keir Nellyer
dab1f9485c Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report 2016-04-24 17:17:17 +01:00
Keir Nellyer
9df4dac023 Remove dead code 
This was left over from before I took over development of the report
feature.
 2016-04-24 17:16:36 +01:00
Keir Nellyer
713263214f Run ReportPurgeTask asynchronously 
This prevents the task from hanging the server which may be an issue
when a large amount of reports exist.
 2016-04-24 17:15:12 +01:00
Keir Nellyer
57e9cd6e19 Add class headers and remove @author tags 
This makes the PR compliant with with the Mineplex coding style.
Class headers are used to describe the function of a class and git
history will be used to determine the author of a class.
 2016-04-24 17:10:29 +01:00
cnr
c7970d1bd0 Prevent super paintball spectators from reviving teammates. Fixes PC-103 2016-04-22 19:48:03 -05:00
Jonathan Williams
fe0cee65e8 Added gem and coin rewards back into bonus. 2016-04-22 05:33:25 -05:00
Jonathan Williams
260c617007 Merge remote-tracking branch 'remotes/origin/alex-mcl' into develop 2016-04-22 05:12:30 -05:00
Jonathan Williams
e28621ae26 Set oldElo equal to new elo on new row. 2016-04-22 05:04:13 -05:00