Commit Graph

6156 Commits

Author SHA1 Message Date
Keir 19301271a4 Fix format character. 2016-01-13 11:51:49 +00:00
Keir 26246604a7 This should've gone with the previous commit :/ 2016-01-13 11:48:18 +00:00
Keir 53133d51ee Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-01-13 11:47:13 +00:00
Keir 1c49e3a111 Make chat log clickable, only close report instruction line suggests command. 2016-01-10 21:28:57 +00:00
Shaun Bennett 46695f8449 Fix hub fly for YOUTUBE_SMALL 2016-01-09 18:44:32 -05:00
Shaun Bennett 83e5c7399e Fix YOUTUBE_SMALL preferences 2016-01-09 18:41:19 -05:00
Shaun Bennett 8193b5121b Dont allow /disguise for YOUTUBE_SMALL 2016-01-09 18:39:47 -05:00
Shaun Bennett cd3037e7e5 Fix treasure purchases 2016-01-09 18:37:24 -05:00
Keir bd865c7e64 Fix command permissions. 2016-01-09 23:12:08 +00:00
Keir 7db3f3469f Destroy pool when a thread ends. 2016-01-09 22:21:27 +00:00
Keir 5f362a878a Run some Redis functions async (as it sometimes blocks). 2016-01-09 22:21:15 +00:00
Keir 8b3bc7ca18 Fix timezone, correct url prefix and remove old debug code. 2016-01-09 21:51:54 +00:00
Shaun Bennett 2df626b35e Fix CustomDataManager crash 2016-01-08 18:06:33 -05:00
Shaun Bennett 511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Keir 710654cd06 Use Validate class from Apache Commons to minify code. 2016-01-08 15:06:13 +00:00
Keir 7ce028203b Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report 2016-01-08 13:59:43 +00:00
Keir 5cb91bb315 Allow reuse of ReportManager instance (for later use). 2016-01-08 13:59:30 +00:00
Shaun Bennett ee73b374a6 Forgot to uncomment in ClansLoginManager 2016-01-08 06:36:59 -05:00
Shaun Bennett a75e2c15b8 Merge remote-tracking branch 'origin/develop' into develop 2016-01-08 06:35:37 -05:00
Shaun Bennett 8d197c9ece Merge pull request #120 in MIN/mineplex from bugfix/disguise-command to master
* commit '5482d1dc402eb2746d65323d5f08b51b97285a54':
  Fixing "kicked for Flying"
  Fixing Join/Quit messages
  updating denial message
  Love you Sarah <3
  Fixing Disguise File
  update /Disguise for Hub as well
  updating /disguise
2016-01-08 05:35:17 -06:00
Shaun Bennett 15109707f3 Merge pull request #119 in MIN/mineplex from clans/alpha to develop
* commit '025615d080b8b925f319a2f7707d2c3fa4755a88':
  Clans Alpha 0.18b fixes
2016-01-08 05:34:35 -06:00
NewGarbo 025615d080 Clans Alpha 0.18b fixes 2016-01-08 11:24:36 +00:00
Sarah 5482d1dc40 Fixing "kicked for Flying" 2016-01-08 12:17:28 +01:00
Shaun Bennett 0a56a838d2 Fix ClansLoginManager, Remove pointless code in CoreClientManager 2016-01-08 05:45:49 -05:00
Shaun Bennett 6096fcad42 Fix hotbar issues 2016-01-08 04:06:11 -05:00
Shaun Bennett 504d9d508c Slightly reduce Squid's Ink Blast damage in SSM 2016-01-08 03:15:30 -05:00
Shaun Bennett 1d2f61db8c Disable purchasing Christmas Treasure 2016-01-08 03:15:05 -05:00
Shaun Bennett d1e5669b85 Merge pull request #118 in MIN/mineplex from william-gladiators to develop
* commit 'd361ce948e7794b1fd9d368dee38118f2051fa75':
  Disable hub music
  Disable HolidayManager and HolidayGiftManager
  Revert to normal HubType
  Disable Holiday Words in DMT and Build
  Fixing hotbar
  Working loadouts.
  Added a hotbar layout editor
2016-01-08 01:21:52 -06:00
Shaun Bennett d361ce948e Merge branch 'develop' into william-gladiators
# Conflicts:
#	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilMath.java
2016-01-08 02:21:32 -05:00
Shaun Bennett db7d814e02 Disable hub music 2016-01-08 01:42:05 -05:00
Shaun Bennett 19bb44cb9a Disable HolidayManager and HolidayGiftManager 2016-01-08 01:41:02 -05:00
Shaun Bennett 9c3b07123f Revert to normal HubType 2016-01-08 01:39:54 -05:00
Shaun Bennett 003af1b87c Disable Holiday Words in DMT and Build 2016-01-08 01:38:49 -05:00
Shaun Bennett b6b455c1c0 Merge pull request #117 in MIN/mineplex from clans/alpha to develop
* commit '15d2118bc1701b79576f6d73dc1d4aeca500f11e': (23 commits)
  Added C.Mod rank, and started on rank info.
  changed outpost forcefields to be a bit larger to surround the outpost more.
  made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request.
  added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around.
  fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost)
  fixed outpost being built instantly on output block place.
  holograms above outpost block should be centered in the block and made them despawn on outpost death
  legendary pickkup message fix (FINALLY FIXED NOW )
  quick modification to outposts, and fixed the legendary announcements being weird
  updated clans version
  quikc change
  outpost changes, and some other things
  lots of work on outposts, fixed gold dupe glitch, fixed clans ban gui title being "Customize New Gear".
  fixes (?)
  lots of changes that i can't remember at this point
  Lots of changes, specifics: Fixed clans having more than max energy. Made /c home work from anywhere, 20 secs warmup, 30 secs in claimed territory. /c <clan> now works with clans with 18+ players.
  player gold exploit checking. i know this code is strange but please don't delete it. we need it for now.
  a couple more prettificatons to pvp timer messages.
  one more quick message change/fix
  qa changes to pvp safety
  ...
2016-01-08 00:35:15 -06:00
NewGarbo 15d2118bc1 Added C.Mod rank, and started on rank info. 2016-01-07 23:32:51 +00:00
NewGarbo e1e8c2bb97 changed outpost forcefields to be a bit larger to surround the outpost more. 2016-01-07 21:02:55 +00:00
NewGarbo 43f075014a made outposts have a "forcefield" whilst they are being built. also made legendary announcements a different color as per Simon's request. 2016-01-07 20:05:33 +00:00
NewGarbo fff6d8e03f added server shutdown event, along with making the outposts cleanup on server shutdown to prevent debris of currently in-play outposts sticking around. 2016-01-07 19:36:52 +00:00
Keir 3be6030a5d Exit if no identifier is supplied before any errors are caused. 2016-01-07 16:21:33 +00:00
Keir 21d8576787 Fix "bubbles" becoming detached from their icon. 2016-01-07 15:52:03 +00:00
NewGarbo 90a06d97b5 fixed npe on cleanup() because it doesn't check if the holograms are null or not. (they may or may not be null at the time of cleanup() being called depending on the current state of the outpost) 2016-01-07 14:04:26 +00:00
NewGarbo d4fdda8ef2 fixed outpost being built instantly on output block place.
cleaned up a bit
2016-01-07 14:03:15 +00:00
NewGarbo 5c810a46c9 holograms above outpost block should be centered in the block and made them despawn on outpost death 2016-01-07 13:26:18 +00:00
NewGarbo e9789b2ee8 legendary pickkup message fix (FINALLY FIXED NOW ) 2016-01-07 10:31:23 +00:00
NewGarbo d88b14d9d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-07 09:35:07 +00:00
NewGarbo b685a207bc quick modification to outposts, and fixed the legendary announcements being weird 2016-01-07 09:34:16 +00:00
Keir 644453a9c4 Name PubSub threads. 2016-01-07 07:06:55 +00:00
Keir a63d98a2d7 Write to files asynchronously. 2016-01-07 07:04:24 +00:00
Keir abc15e3a4c Handle multiple multi-threaded Redis connections (and re-connections), improved logging, various refactors. 2016-01-07 06:58:21 +00:00
Keir 98a7b6d6d6 Allow data directory to be configured using a command-line parameter. 2016-01-07 04:40:39 +00:00