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
William Burns
d4febf834d
Merge branches 'feature/jobs-site' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/jobs-site
2016-04-28 18:19:08 +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
Conrad
15dbf57ce5
Merge pull request #36 from Mineplex-LLC/feature/game-cmd-mode
...
Game Command Mode System
2016-04-27 18:28:39 -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
AlexTheCoder
6bf86a1550
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-26 10:17:01 -04:00
md_5
807b12e846
Fix TnT datawatcher
2016-04-25 10:38:01 +10:00
md_5
d8f7301e69
Update to latest Spigot
2016-04-25 10:29:17 +10: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
phobia
b21939444c
Some changes to error handlng for clans regions
2016-04-23 16:40:39 +10: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
AlexTheCoder
2f94b8cebc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 06:04:33 -04:00
Jonathan Williams
e28621ae26
Set oldElo equal to new elo on new row.
2016-04-22 05:04:13 -05:00
AlexTheCoder
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
AlexTheCoder
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
Jonathan Williams
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
Jonathan Williams
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
Jonathan Williams
6db7e648f5
Don't insert new row if the update doesn't succeed because of elo mismatch on loss.
2016-04-22 04:20:59 -05:00
Jonathan Williams
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
Jonathan Williams
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
Jonathan Williams
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
Jonathan Williams
a31eccc15b
Multiply new rating by team size. MIssed that undo!
2016-04-22 02:53:02 -05:00
Jonathan Williams
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
Jonathan Williams
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
Jonathan Williams
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
AlexTheCoder
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
AlexTheCoder
5e255fc4ed
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:36:21 -04:00
Jonathan Williams
757c945320
Added in kFactor ratio application to rating delta.
2016-04-22 02:35:37 -05:00
AlexTheCoder
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
Jonathan Williams
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
Jonathan Williams
aa6d25139f
Tweaked elo for team games.
2016-04-22 02:04:57 -05:00
AlexTheCoder
b1c05e2ed0
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:12:02 -04:00
Jonathan Williams
776093288a
Fixed rating not setting in EloPlayer constructor.
2016-04-22 01:11:48 -05:00
AlexTheCoder
2d2c8858e6
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 02:06:55 -04:00
AlexTheCoder
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
Jonathan Williams
977fbe684a
Fixed elo query.
2016-04-22 01:06:33 -05:00
Jonathan Williams
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
