Commit Graph

7623 Commits

Author SHA1 Message Date
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
Shaun Bennett 8a5fdccb60 Add to fountain button 2016-04-22 11:26:05 +10: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
Shaun Bennett 435d3968a2 Fix Fountain string being changed to Counter from refactor 2016-04-21 19:46:20 +10: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
Shaun Bennett 54f0b99756 Add fountain gui command 2016-04-21 11:41:16 +10: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
LCastr0 793f5b3f41 Test gadget added by LCastr0, to get used to the code 2016-04-19 15:20:31 -03:00
LCastr0 2b80ebabf7 Test gadget added by LCastr0, to get used to the code 2016-04-19 15:14:22 -03: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
Shaun Bennett cb48df6a3d Update fountain count every 5 seconds. Display Hologram 2016-04-19 14:30:38 +10:00
Shaun Bennett 6dc2559dd1 Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems 2016-04-19 13:57:33 +10:00
Shaun Bennett 5a667a7d31 Add /fountain command. Fountain implementation 2016-04-19 13:57:19 +10: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
xGamingDudex d9b6434bad Typo in description 2016-04-18 23:24:59 +02:00
xGamingDudex 534a5dee4e Forgot to remove debug message 2016-04-18 22:18:42 +02:00
xGamingDudex 591d3cadc9 Cleaned up some GUI stuff, mostly lores on items 2016-04-18 22:16:10 +02:00
xGamingDudex e45f800519 Fixed damage calculator error 2016-04-18 20:36:22 +02:00
md_5 9de990744d Stage 2016-04-18 17:46:38 +10: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