Commit Graph

1043 Commits

Author SHA1 Message Date
Shaun Bennett 1c3c800a66 Update fixes - @Teddy! 2016-01-29 14:05:09 -05:00
Shaun Bennett c1f91cbfb0 Final changes 2016-01-29 03:56:49 -05:00
Shaun Bennett 863be023d9 Prep for update 2016-01-29 03:36:52 -05:00
Shaun Bennett eb29c6b367 Fix constructor 2016-01-28 22:28:18 -05:00
Shaun Bennett 0177cf91bb Merge with develop 2016-01-28 22:23:17 -05:00
Shaun Bennett 051d70771b Facebook Command 2016-01-28 22:15:35 -05:00
teddy 63cea58f05 Waiting for a testing session. 2016-01-28 17:18:24 +00:00
Shaun Bennett 311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
Shaun Bennett a41816ca22 Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
Teddy 1e72ebcbe6 Merge branch 'master' into rankdescriptions
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
md_5 447583624e Fix ascii.png duplication. 2016-01-21 17:47:21 +11:00
Shaun Bennett 359655f417 Merge pull request #131 in MIN/mineplex from md_5/suspicious to develop
* commit '4927bb8c0b6b1fcebe41adf9f38489fe82116cfa':
  Fix some misc suspicious calls to Collection methods.
2016-01-20 12:23:55 -06:00
Shaun Bennett 037a2f8353 Change craftbukkit to provided scope, add ascii.png to Hub and Arcade, new /bversion command 2016-01-20 13:04:31 -05:00
Shaun Bennett 8977735baf Include a version.properties in maven build 2016-01-20 11:57:21 -05:00
Shaun Bennett ea315a1447 Merge remote-tracking branch 'remotes/origin/md_5/maven' into develop
# Conflicts:
#	Plugins/Libraries/craftbukkit.jar
2016-01-20 10:19:09 -05:00
Shaun Bennett 77d9f7cf32 Merge branch 'master' into develop 2016-01-20 10:12:20 -05:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Shaun Bennett 044d2bac83 Fix some Invisibility preference bugs 2016-01-17 22:55:04 -05:00
Shaun Bennett 2b6074a210 Merge remote-tracking branch 'remotes/origin/bugfix/disguise-command' 2016-01-17 22:46:56 -05:00
Sarah 5ed9295944 updating Hub command as well 2016-01-17 18:10:16 +01:00
md_5 4927bb8c0b Fix some misc suspicious calls to Collection methods. 2016-01-17 20:20:48 +11:00
Sarah 410bc1c74b not being able to disguise as banned/muted players 2016-01-15 19:12:50 +01:00
Shaun Bennett 4e9a4c87d4 Merge pull request #123 in MIN/mineplex from bugfix/disguise-command to develop
* commit '0f587ba5d908afdccb877358d71e56a3edda49cd':
  fixing "Kicked for flying again" again...
2016-01-11 17:20:51 -06:00
Shaun Bennett 3693a2b2c5 Merge pull request #122 in MIN/mineplex from bugfix/thanos to develop
* commit 'ed439569453dc248623834af6fb553341779e46c':
  Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats.
  Remove unused imports.
  Prevent players from stacking others with a menu inventory opened.
  Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop.
2016-01-11 16:26:09 -06:00
Thanos paravantis ed43956945 Hub: Add dots at the end of stacker messages, prevent players from stacking bat blaster bats. 2016-01-10 16:37:51 +02:00
Shaun Bennett 46695f8449 Fix hub fly for YOUTUBE_SMALL 2016-01-09 18:44:32 -05:00
Shaun Bennett 8193b5121b Dont allow /disguise for YOUTUBE_SMALL 2016-01-09 18:39:47 -05:00
Thanos paravantis ce1bac8037 Remove unused imports. 2016-01-09 17:03:14 +02:00
Thanos paravantis 62e1fb3688 Prevent players from stacking others with a menu inventory opened. 2016-01-09 17:01:57 +02:00
Sarah 0f587ba5d9 fixing "Kicked for flying again" again... 2016-01-09 12:07:57 +01:00
Thanos paravantis ba3e7cb197 Merge branch 'master' into bugfix/thanos 2016-01-09 12:23:54 +02:00
Shaun Bennett 511b39caa7 Merge branch 'master' into develop 2016-01-08 17:05:54 -05:00
Sarah 5482d1dc40 Fixing "kicked for Flying" 2016-01-08 12:17:28 +01: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 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 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
Thanos paravantis 101caf12ff Hub: Hide stacker message when player clicks on an NPC. Display correct KOTH PvP Sword display name on player item drop. 2016-01-05 20:48:28 +02:00
Sarah db2cddc443 Fixing Join/Quit messages 2016-01-05 19:10:40 +01:00
Shaun Bennett 10eb65a8d6 Merge pull request #114 in MIN/mineplex from bugfix/disguise-command to develop
* commit 'dd6d7b1b96947a400911bc5fa310039ab147c159':
  updating denial message
  Love you Sarah <3
  Fixing Disguise File
  update /Disguise for Hub as well
  updating /disguise
2016-01-04 15:58:43 -06:00
Shaun Bennett 962efe4a61 Fix not being able to join games through portals 2016-01-04 16:41:07 -05:00
Shaun Bennett c50fb52a88 Disable New Years Countdown 2016-01-04 14:21:21 -05:00
Shaun Bennett c739ecc26d Fix forcefield for YOUTUBE_SMALL 2016-01-04 14:20:39 -05:00
Sarah dd6d7b1b96 updating denial message 2016-01-02 16:45:15 +01:00
Morten 7e1b0b9110 Love you Sarah <3 2016-01-02 03:19:39 +01:00
Sarah a06a0060aa Fixing Disguise File 2016-01-02 01:53:19 +01:00
Sarah a30c2b0d75 update /Disguise for Hub as well 2016-01-02 00:53:56 +01:00
Shaun Bennett 2e017fa5ca Fix redis command 2015-12-31 16:11:51 -06:00
Shaun Bennett 8232d11cd1 Remove in game notifications, change sale message 2015-12-31 15:07:26 -06:00