Commit Graph

3122 Commits

Author SHA1 Message Date
Keir Nellyer a663cb3e01 Revert "Revert "Report system (version 1)""
This reverts commit d0d2de1e21.

# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-05-04 15:24:29 +01:00
AlexTheCoder 0e509898ec Add a method for simply checking if a player has been participating in the current game, and implement it in the ranked bans system 2016-05-03 21:07:50 -04:00
AlexTheCoder 070326e72d Create systems to automatically create and destroy branding boards, as well as implement the Logitech branding 2016-04-30 19:26:16 -04:00
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 41e26f283c Fix all async elo ranked ban methods and switch to callback system for API hooks 2016-04-30 14:10:09 -04: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 2887630cf8 - Added javadoc headers 2016-04-28 21:11:38 -04:00
TadahTech 680e579223 Merge Alex's branch into mine.
Convert to Java 8
Remove unneeded comments.
2016-04-28 19:39:24 -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
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
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 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
cnr c7970d1bd0 Prevent super paintball spectators from reviving teammates. Fixes PC-103 2016-04-22 19:48:03 -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 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 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 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
AlexTheCoder 1d3ad3c5fd - Enabled ELO for testing 2016-04-22 02:06:37 -04: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
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
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