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

7193 Commits

Author SHA1 Message Date
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
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
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
Jonathan Williams
6d00e8b41f Refactored Elo to work correctly. 2016-04-22 00:21:11 -05:00
AlexTheCoder
d0e3b094c1 - cleaned up and prepped for live update 2016-04-21 20:57:35 -04:00
Shaun Bennett
86df07123c Merge pull request #28 from Mineplex-LLC/bugfix/admin-command-npe 
Fix NPE in AdminCommand from IncognitoManager being null
 2016-04-22 10:54:20 +10:00
Shaun Bennett
e46798f20e Fix NPE in AdminCommand from IncognitoManager being null 2016-04-22 10:49:34 +10:00
AlexTheCoder
e55bec505b - Fix players ending up teleported back to arena due to broken respawn engine 2016-04-21 20:13:39 -04:00
AlexTheCoder
df55d48ab8 - Looks better 2016-04-21 01:03:14 -04:00
AlexTheCoder
d57cc48f0f - Added new features! 2016-04-20 22:31:54 -04:00
Joseph Prezioso Jr.
f86b18b603 Elo Works Now 
Ready to move on to MCL implementation
 2016-04-20 22:09:18 -04:00
cnr
2d02d79cec Fix survival games' Beastmaster wolf spawning 
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
 2016-04-20 18:45:54 -05:00
Joseph Prezioso Jr.
2d45ab61cc Elo re-calculated 
Elo is now being incremented more consistently (and not multiple times)
 2016-04-20 15:48:27 -04:00
Joseph Prezioso Jr.
6a5c8336cf Elo and Division fixed 
Elo and Division should be displaying properly

Cleaned the code up a bit

Added endElo() to Game.java to handle team Elo code

Added event listener to check for GameState.End in TDM to call endElo()
 2016-04-20 14:52:06 -04:00
AlexTheCoder
588e6f08c2 - Removed TypeWars achievements to make room 2016-04-19 18:07:20 -04:00
cnr
ef8474ae9d Set default CustomExplosion maxFallingBlocks to 0 
This fixes an exception thrown when the trap rune in Wizards is
activated.
 2016-04-19 02:59:31 -05:00
cnr
bda9772ba6 Mitigate spigot issue when setting wolf owner 
This fixes the Summon Wolves spell in Wizards.

Explanation:

- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
  watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
  against the new one
- If the wolf didn't have a previous owner, the old owner's
  UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
  an exception.
 2016-04-19 02:46:38 -05:00
AlexTheCoder
e08965aa25 - Fixed TowerDefender being too difficult to obtain 
- Fixed wither attacking own towers by accident
 2016-04-18 22:58:55 -04:00
AlexTheCoder
6c20427395 - Fixed some bugs and added final achievements 2016-04-18 22:32:15 -04:00
AlexTheCoder
17ac3cb597 - Fix armor checking 
- Edit wither death message
 2016-04-18 20:29:53 -04:00
AlexTheCoder
10aba533f3 - Remove all dependence on UtilShapes 2016-04-18 19:59:55 -04:00
AlexTheCoder
34399db6e8 - Fixed missing GameType 2016-04-18 18:42:56 -04:00
AlexTheCoder
44263beb87 - Make elo store/recover properly 2016-04-17 17:34:18 -04:00
cnr
4227e24ae0 Reintroduce non-Air constraint to cannon explosion 2016-04-17 16:29:23 -05:00
cnr
e375db5aec Refactor cannon explosion effect for clarity 2016-04-17 13:33:44 -05:00
AlexTheCoder
ee30012011 Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix 2016-04-17 12:27:23 -04:00
AlexTheCoder
d623d0982b Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge 2016-04-17 12:02:08 -04:00
AlexTheCoder
4c35e35fc0 - More polish and bugfixes 2016-04-16 23:59:44 -04:00
Shaun Bennett
4477a215f4 Update to Redis 2.8.1 and clean up repositories (#26) 2016-04-16 22:51:20 -05:00
AlexTheCoder
35d7dd8b44 - Fixed stuff 2016-04-16 20:36:19 -04:00
AlexTheCoder
b0d30a4ff4 - cleaned everything up 
- renamed game
 2016-04-16 20:32:14 -04:00
AlexTheCoder
d8f5ac66fc - More chiss 2016-04-16 14:05:46 -04:00
cnr
9c6d23f11e Correctly count cannon explosion effect attempts 
Previously, cannon explosions effects could lock up the main thread if:
- The effect location selection RNG was sufficiently unlucky
- The explosion occured sufficiently deep into a larger claimed
  territory
 2016-04-16 07:31:00 -05:00
Joseph Prezioso Jr.
bbb81dd663 Elo calls migrated to Game.java 
Consequently, elo code is actually being called now

Bukkit.broadcastMessage calls have shown where things are breaking

handleElo() added to EloManager to facilitate movement of team elo code

preparing to use EloManager's getNewRatings() method to 
calculate team elos
 2016-04-15 20:48:56 -04:00
Jonathan Williams
2b2b251548 Merge branch 'clans/beta' into develop 2016-04-15 12:41:14 -05:00
Jonathan Williams
019cfe41cc Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-15 12:40:54 -05:00
Jonathan Williams
609eb562e9 Merge branch 'clans/beta' into develop 2016-04-15 12:40:26 -05:00
Jonathan Williams
a730b81feb Commented out TournamentManager, moving off develop. 2016-04-15 12:38:25 -05:00
Jonathan Williams
b43953439e Properly store teamId locally after registering for tournament. 
Use team id when unregistering for the tournament.
 2016-04-15 12:36:28 -05:00
Jonathan Williams
cf3141ddc0 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop 2016-04-15 12:30:32 -05:00
cnr
77b6515387 Don't break the repair anvil more than twice 2016-04-15 12:21:25 -05:00
cnr
91d5851628 Don't set a clan's lastOnline time to Timestamp(0) 
Partially reverts f011fdad5f
 2016-04-15 12:21:25 -05:00