Commit Graph

1978 Commits

Author SHA1 Message Date
Shaun Bennett cf73d27a84 Merge remote-tracking branch 'origin/master' 2015-12-10 20:53:42 -05:00
Shaun Bennett 4d05bd5c50 Player count for chiss 2015-12-10 20:53:38 -05:00
Shaun Bennett 851b613d2e Now playing fix 2015-12-10 17:04:15 -05:00
Shaun Bennett 7f75749194 Merge remote-tracking branch 'origin/master' 2015-12-08 16:55:14 -05:00
Cheese fba88ec231 mount stuff is fixed 2015-12-09 08:19:55 +11:00
Shaun Bennett ca71f1f64f Merge remote-tracking branch 'origin/master' 2015-12-08 14:32:17 -05:00
Shaun Bennett a1915e324c Some java 8 code 2015-12-08 08:42:45 -05:00
Shaun Bennett 42a0354c9e Now Playing, Preference to disable ads 2015-12-07 18:28:05 -05:00
Shaun Bennett 8ff034fb5d Merge pull request #89 in MIN/mineplex from clans-beta to master
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
  Winter MOTD, Stat fixes (maybe?!)
  made use ability teleport player back to where they should be
  Forgot to push these changes last update!
  fixed tnt blowing up in claims when offline
  fixed task not getting cleanup up after /skiptutorial
  fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
  Fix heavy attribute, disable claim visualizer
  Disable subtasks for now
  Clans alpha 0.17
  clan claim visualizer
  fixed infinite claims
2015-12-07 12:22:10 -06:00
Shaun Bennett c3ace42a68 Winter MOTD, Stat fixes (maybe?!) 2015-12-07 13:21:11 -05:00
Shaun Bennett ffbb057d23 Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
  Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-07 11:25:17 -06:00
Shaun Bennett c6c012031f Less ugly formatting 2015-12-07 04:44:19 -05:00
Shaun Bennett 4354133de9 Add Minecraft timings to /lag 2015-12-07 04:40:34 -05:00
Cheese e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Shaun Bennett 44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Shaun Bennett 7b5db2d4fb Hub Music, HubMusic Preference 2015-12-07 00:58:44 -05:00
Shaun Bennett 488895ea53 Note block player 2015-12-06 21:12:10 -05:00
Cheese ccb6456110 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
2015-12-06 18:09:24 +11:00
Cheese 35c362b8bf small youtuber perms 2015-12-06 18:08:36 +11:00
Shaun Bennett b7b5235f59 Fix error 2015-12-06 00:57:43 -05:00
Cheese d095e14b4c Merge branch 'monster-league' 2015-12-06 16:33:21 +11:00
Cheese 9880e9a3c7 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-06 16:32:59 +11:00
Cheese 040e94f1fb bouncy 2015-12-06 16:32:45 +11:00
Shaun Bennett 618105b4c8 Add minimum rank to Announcement Command 2015-12-06 00:15:49 -05:00
Shaun Bennett 8d831d5228 Fix END_PORTAL bug causing gui's to break 2015-12-06 00:06:31 -05:00
Shaun Bennett 32a6d572ee Disable gadgets in arcade for player count > 40 2015-12-05 22:56:15 -05:00
libraryaddict b98944b0a0 Handle attach entity 2015-12-06 14:38:00 +13:00
libraryaddict d5606f55ea Modified CustomTagFix to support player name titles 2015-12-06 10:18:35 +13:00
Keir 9bd7869e22 Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved. 2015-12-05 01:08:21 +00:00
Shaun Bennett 5c575b41fc Clans alpha 0.17 2015-12-04 05:15:28 -05:00
Christopher Jozsa 8717f962e6 Merge pull request #83 in MIN/mineplex from mrsomeone12_SmallFixes to master
* commit 'c98b427fdebb0d8abcce3a17731c0f9b35eece01':
  Added missing MountData and SingleEntityMountData files.
  Mount bug fix.
  Added method to edit NoAI field on entities.
  Implemented new mount data system replacing instead of entities as data.
  We only need to add the "Go Back" page once...
  TitanMount fixes
2015-12-03 17:15:21 -06:00
NewGarbo d6ca52e4a4 modifications 2015-12-02 05:11:09 +00:00
Jonathan Williams 633697dc7a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-30 23:49:32 -06:00
Jonathan Williams 03a1f19df9 Fixed memory leaks in Disguise and Recall.
Removed debug messages in ItemMapManager
2015-11-30 23:49:16 -06:00
Cheese 51023a7630 cosmetic cooldown fix 2015-12-01 15:38:54 +11:00
Cheese 208eaf3a01 cosmetics recharge slowdown 2015-12-01 11:38:52 +11:00
xGamingDudex c98b427fde Added missing MountData and SingleEntityMountData files.
For some reason, git decided that it was a good idea to remove these two
files from the index...
2015-12-01 00:46:20 +01:00
xGamingDudex 6120c8246b Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes 2015-11-29 19:11:24 +01:00
xGamingDudex d1d58919f4 Mount bug fix.
Mount was put in map before removed, resulting in new mount being half
disabled.
2015-11-29 19:09:55 +01:00
xGamingDudex 509835ea64 Implemented new mount data system replacing instead of entities as data.
+ Removed some unnecessary code
+ Made StackManager use new mount system

This system also fixes a bug allowing players "hijack" some of the
mounts as it was not properly persistent.
2015-11-29 19:08:00 +01:00
xGamingDudex 327bf8d09b We only need to add the "Go Back" page once... 2015-11-29 18:32:24 +01:00
Shaun Bennett 7c947ad97b Merge master 2015-11-28 23:55:00 -05:00
NewGarbo 9ff9724fc8 tutorial revamp 2.0 2015-11-29 02:10:39 +00:00
Cheese 5cefe27257 cosmetic fixes 2015-11-29 11:40:19 +11:00
NewGarbo aa68701ebd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 20:16:49 +00:00
xGamingDudex dc0da3987b TitanMount fixes
Added so that the magma cube is looking in the direction of which the
player is flying.
Removed players ability to unequipt the armorstand that take out the
netherrack block from their head slot.
2015-11-28 17:22:17 +01:00
Cheese 51227ae4f3 fixed leak 2015-11-29 01:25:15 +11:00
NewGarbo 0dceca5cfc Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-11-28 09:04:15 +00:00
NewGarbo a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
Cheese 700cf51206 titan stuff almost done 2015-11-28 16:35:11 +11:00