Commit Graph

7882 Commits

Author SHA1 Message Date
cnr 4cffb39941 Delay dismount teleport by one tick
This mitigates a stack overflow caused by a teleport before a dismount
event processes fully.
2016-05-01 01:30:42 -05:00
AlexTheCoder 48c8a5a630 Force structure to spawn correctly, complete with maps on item frames 2016-05-01 01:56:07 -04:00
Ben 189f9ad524 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-05-01 01:42:32 +01:00
Ben 2337e89a93 Improvements to the Clans ban system in general as it was performing more operations than required, and accessing the database more than was necessary. Polished up the Clans ban GUI as well. 2016-05-01 01:42:11 +01:00
cnr 8ca38b2598 Prepend http:// to resource pack locations 2016-04-30 18:54:17 -05: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
cnr 10166f063b Merge branch 'develop' into clans/beta 2016-04-30 16:16:57 -05:00
phobia 14204fba5c Changed resource packs to home hosted ones 2016-04-30 16:02:26 -05:00
phobia 890ab9f67e Uncommented ClansBanManager's instances 2016-04-30 16:02:26 -05:00
phobia f1c2e71d56 Some changes to error handlng for clans regions 2016-04-30 16:02:26 -05:00
cnr 634a34dd52 Reintroduce non-Air constraint to cannon explosion 2016-04-30 16:02:26 -05:00
cnr 2eb7b892e0 Refactor cannon explosion effect for clarity 2016-04-30 16:02:26 -05:00
cnr f2f627116a 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-30 16:02:26 -05:00
AlexTheCoder 39c105f0cf Add catch for rare occurrence where players have no stored data 2016-04-30 15:34:04 -04:00
Conrad 01bc9e9e6b Merge pull request #44 from Mineplex-LLC/revert-24-feature/report
Revert "Report system (version 1)"
2016-04-30 14:55:14 -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 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
Conrad c0b26c5b1e Merge pull request #24 from Mineplex-LLC/feature/report
Report system (version 1)
2016-04-30 11:47:12 -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
Conrad 851cd6799d Merge pull request #39 from Mineplex-LLC/alex-mcl
Balance Fix/Update
2016-04-29 08:36:39 -04:00
Shaun Bennett 184d247fc9 Start adding BoosterPage. Move Boosters to core to support UI's 2016-04-29 17:37:34 +10:00
phobia f63a872bd4 Changed resource packs to home hosted ones 2016-04-29 14:46:14 +10:00
AlexTheCoder a8d9745320 - Fixed order of Top Elo 2016-04-29 00:12:25 -04:00
phobia c814fc73f7 Uncommented ClansBanManager's instances 2016-04-29 12:53:20 +10: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