JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,455 Commits 1 Branch 0 Tags 481 MiB
fe849576f7
Commit Graph

6231 Commits

Author SHA1 Message Date
NewGarbo
7f1c74ced5 bumped version up to 0.19 2016-01-25 17:11:08 +00:00
Sarah
53132a248f the L 2016-01-25 12:28:21 +01:00
Sarah
c7733bb068 Updateting spectator Menu layout. 2016-01-25 12:27:19 +01:00
Sarah
91b6ae8b09 fixing spec item in menu 2016-01-25 12:14:56 +01:00
Shaun Bennett
4314f35f80 Multiply by less 2016-01-25 04:46:47 -06:00
Shaun Bennett
b143ec7c19 negative! 2016-01-25 04:42:09 -06:00
Shaun Bennett
6ff7c83d3e Trying different hologram location 2016-01-25 04:17:58 -06:00
Shaun Bennett
616be8aea7 Fix messages, fix /stats 2016-01-25 03:59:37 -06:00
Shaun Bennett
d511ca5bad Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-25 03:51:44 -06:00
Shaun Bennett
bc8f6e511c Center hologram 2016-01-25 03:44:22 -06:00
Virizion
2dcc356aab Make achievement category classics 2016-01-25 04:33:25 -05:00
Shaun Bennett
61f1a58b1c hologram changes 2016-01-25 03:29:53 -06:00
Shaun Bennett
181cce4774 Holograms maybe? 2016-01-25 03:08:56 -06:00
NewGarbo
5b32911a42 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-25 08:46:26 +00:00
NewGarbo
0b7cec60ae put cmod above support so that support can't bypass clans home block 2016-01-25 08:44:17 +00:00
NewGarbo
d82a7b353f allow C.Mods to join all server regardless of home servers 2016-01-25 08:42:38 +00:00
Virizion
219b86ae55 Chiss' checklist. 2016-01-25 03:01:54 -05:00
Sarah
31ef7ffe19 Removing right clicking. 2016-01-25 07:45:38 +01:00
Sarah
f722831e6a removing switching players until spigot patch is on. 2016-01-25 05:44:06 +01:00
Sarah
9e63c9000a adding spectator rotation. 2016-01-25 04:30:42 +01:00
Virizion
bfe9aa7a59 Remove unnecessary tabs. Make the judge guardian use it's own laser again. 2016-01-24 21:55:57 -05:00
Virizion
0eda813d41 Fixed builds with only mobs not loading. 2016-01-24 19:14:34 -05:00
Sarah
00f01e09af adding entity spectating by right clicking and right clicking head in compass menu. 2016-01-24 20:00:05 +01:00
NewGarbo
1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00
Virizion
a747426fa0 Fixed mobs. 2016-01-23 05:00:14 -05:00
Virizion
a359c4f8b6 Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder 2016-01-23 03:42:50 -05:00
Virizion
1e732b08e7 TICK TICK TICK TICK. 2016-01-23 03:42:36 -05:00
Cheese
790e2e8f73 Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder 2016-01-23 19:32:37 +11:00
Cheese
c1ff7f4fc2 all players equal, no one loses 2016-01-23 19:32:23 +11:00
Virizion
a75770b0a6 Change build to load from top instead of bottom. 2016-01-23 03:15:41 -05:00
Shaun Bennett
650d586e0f Add perfect build count to stats 2016-01-23 02:49:08 -05:00
Shaun Bennett
f82a408f30 Build time modifiers 2016-01-23 02:43:41 -05:00
Virizion
5dc773032b Add joining players to guardians team instead of spectator. 2016-01-23 02:10:11 -05:00
Virizion
245cc1ed93 Limit Perfectionist achievement to 1. 2016-01-22 22:18:29 -05:00
Shaun Bennett
311d42db30 Use Garbo's description changes 2016-01-22 19:48:06 -05:00
Shaun Bennett
231b8cb19a Merge pull request #133 in MIN/mineplex from bugfix/foo to develop 
* commit '376f719c261bd2152a6646a152472a2485e1b689':
  fixes important bug, fixed a scary typo!
  Lots of typo fixes and such
  i before e!
  fixed cosmetic menu item dropping bug
  more grammatical errors hast been fixed
  Grammatical errors hath been fixed!
 2016-01-22 18:38:26 -06:00
Shaun Bennett
b2e4dff9e5 Add time to perfect build message 2016-01-22 19:18:23 -05:00
Shaun Bennett
02b45bd302 Forgot to register stat tracker 2016-01-22 19:14:25 -05:00
Shaun Bennett
ddc86f0897 Add Speediest Builderizer achievement 2016-01-22 19:13:23 -05:00
Shaun Bennett
d0e5be9c93 Guardian is impressed (untested!) 2016-01-22 18:35:18 -05:00
NewGarbo
bf6f1a1701 sapling stuff messed up oops 2016-01-22 15:28:12 +00:00
NewGarbo
6638562866 npe fix 2016-01-22 15:21:20 +00:00
NewGarbo
c4bbeb2535 more control over saplings 2016-01-22 14:55:50 +00:00
NewGarbo
a377a09925 fixed wind blade dupe bug 2016-01-22 11:22:20 +00:00
Virizion
3f715ab4dd Enable inventory click. 2016-01-22 02:23:58 -05:00
Shaun Bennett
4bbd956e14 Don't use the same build twice (untested!) 2016-01-22 01:37:47 -05:00
Shaun Bennett
49e439af55 Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-22 01:28:09 -05:00
Shaun Bennett
6bb60ddebd Ignore empty builds (untested!) 2016-01-22 01:27:29 -05:00
Virizion
c66f37817e Fixed invis bug. 2016-01-22 01:22:31 -05:00
Virizion
5c83f5c1e5 Renamed to Speed Builders from Speed Builder. 2016-01-22 00:20:58 -05:00
Virizion
0da921f3d2 Removed debug thing. 2016-01-21 23:52:59 -05:00
Virizion
a38319147a Stopped physics which fixed the torch bug. 2016-01-21 23:49:49 -05:00
Shaun Bennett
582fa4c915 Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder 2016-01-21 22:42:33 -05:00
Shaun Bennett
c38596a09f Name the guardian, 10 seconds to view builds 2016-01-21 22:42:25 -05:00
Virizion
24e97176cc Call clear build area method on eliminate. 2016-01-21 22:05:30 -05:00
Virizion
d37b8b40fc Disable item merge to (hopefully) fix phantom rails. 2016-01-21 20:41:28 -05:00
Virizion
50c9b33701 Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder 2016-01-21 20:13:53 -05:00
Virizion
636da8f4fa Mob destroying. Removed a debug change that only selected builds with mobs in them. 2016-01-21 20:13:32 -05:00
Cheese
5675aed698 velocity the drops to the player 2016-01-22 11:56:52 +11:00
Virizion
69825893c9 Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder 2016-01-21 19:11:36 -05:00
Virizion
6ab6307f74 Pushing all my stuff for Shaunpai. 2016-01-21 19:08:38 -05:00
Shaun Bennett
877ec4710e Removing duplicate NCP hooks 2016-01-21 17:22:10 -05:00
Shaun Bennett
3803a3d82e Add player heads back to friends lsit 2016-01-21 17:19:51 -05:00
Shaun Bennett
0fd5540de6 Merge pull request #132 in MIN/mineplex from bugfix/give-item-offline to develop 
* commit '404e049c31df6d4278ee3ed46e7f0b8e2f92ee16':
  Give item fix for offline players
 2016-01-21 15:44:34 -06:00
Shaun Bennett
a41816ca22 Include version.properties in Mineplex.Core 2016-01-21 16:37:35 -05:00
Shaun Bennett
a0f39bf36e Merge remote-tracking branch 'origin/develop' into develop 2016-01-21 16:31:52 -05:00
Shaun Bennett
64ec092d09 Rename coin command to shard command 2016-01-21 09:10:39 -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
5af8d747b3 Merge remote-tracking branch 'origin/develop' into develop 2016-01-20 15:07:48 -05:00
Shaun Bennett
269cd710fc Fix wrong group id for spigot excludes 2016-01-20 15:07:39 -05:00
Shaun Bennett
c0d4fa1bea Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop 
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
  Store winner UUID instead of Player object to avoid leaking excess data
  Fixed who the winner is in MB Games.
 2016-01-20 12:33:56 -06:00
Shaun Bennett
4924d652f5 Store winner UUID instead of Player object to avoid leaking excess data 2016-01-20 13:33:40 -05:00
Shaun Bennett
7715df8e6a Merge pull request #130 in MIN/mineplex from md_5/servermonitor/leak to develop 
* commit '55c54eeff4dc72619fc9be1bb724b9dd37804919':
  Fix ServerMonitor not actually removing ServerGroup instances.
 2016-01-20 12:24:33 -06: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
c7bb380a56 Merge pull request #128 in MIN/mineplex from md_5/mineplexer/leak to develop 
* commit '6cf08193dfbedb08352fd3a450022afac0ecd331':
  Fix small memory leak in Mineplexer.
 2016-01-20 12:23:13 -06:00
Shaun Bennett
0a5791a92f Go back to compile scope, need to talk to md_5 about this 2016-01-20 13:13:20 -05: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
8017da9413 Delete JedisTest 2016-01-20 10:25:31 -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
fooify
376f719c26 fixes important bug, fixed a scary typo! 2016-01-19 18:52:54 -08:00
md_5
bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Teddy
573d0dd67d Stats added for all other games 2016-01-19 23:10:45 +00:00
Shaun Bennett
951c27123a Remove /disguise for YOUTUBE_SMALL in arcade 2016-01-18 22:10:01 -05:00
Teddy
c52bc8024c Halloween, added kit to stats 2016-01-18 11:41:30 +00:00
Teddy
740eeae9bd Halloween, added stats 2016-01-18 11:40:46 +00:00
Teddy
3fc25359be Gravity, added stats 2016-01-18 11:38:43 +00:00
Teddy
b22f452b1f Gladiators, added stats 2016-01-18 11:36:16 +00:00
Teddy
297e9baf41 Evolution, added stats 2016-01-18 11:34:43 +00:00
Teddy
f3d27c9d93 Draw my thing, added stats 2016-01-18 11:32:40 +00:00
Teddy
3d88f5aaae Dragons, added stats 2016-01-18 11:11:32 +00:00
Teddy
ba50b5fdb1 Dragon Riders, added default registery 2016-01-18 11:09:19 +00:00
Teddy
c3d9be2123 Dragon Escape Teams, added stats 2016-01-18 11:05:09 +00:00
Teddy
85f4ee50f0 Dragon Escape, added stats + implemented kit display for stats 2016-01-18 11:04:12 +00:00
Teddy
66f484760e Death Tag, added stats 2016-01-18 10:53:56 +00:00
Teddy
96d16932dd Christmas Chaos, added stats 2016-01-18 10:50:04 +00:00
Teddy
dc44207d7a Champ TDM, added stats 2016-01-18 10:48:10 +00:00
Teddy
4e09aa4c34 Champ Dominate,added stats 2016-01-18 10:45:48 +00:00
Teddy
f79acaaa2a Champ CTF,added stats 2016-01-18 10:43:46 +00:00
Teddy
508c4e99d2 Castle Siege,added stats 2016-01-18 10:41:10 +00:00
Teddy
b0eb5a6d4e Cards Against Humanity, skipped/left blank 2016-01-18 10:34:43 +00:00
Teddy
56b3e482f2 Master Builders, added stats 2016-01-18 10:32:38 +00: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
md_5
55c54eeff4 Fix ServerMonitor not actually removing ServerGroup instances. 2016-01-17 20:11:25 +11:00
Sarah
52bda30f85 Mysts OCD again...... 2016-01-17 03:03:00 +01:00
Sarah
4a5d6b5f2a Mysticates OCD.... 2016-01-17 02:48:15 +01:00
md_5
6cf08193df Fix small memory leak in Mineplexer. 
* Leak was on line 74 (toString omitted when removing from String collection).
* Impact was actually pretty much nil - collection is rebuilt every minute.
* Side effect of optimization by using UUID itself which has a good hashCode and fast equals implementation.
 2016-01-16 20:36:49 +11:00
Sarah
410bc1c74b not being able to disguise as banned/muted players 2016-01-15 19:12:50 +01:00
Teddy
c16a719be1 Bridges, added stats 2016-01-15 13:37:55 +00:00
Teddy
9cd7240b61 BouncyBalls, giving errors when Loading, skipping chat stats 2016-01-15 13:28:42 +00:00
Teddy
ec75169b70 BossBattles, giving errors when Loading, removed chat stats. 2016-01-15 13:07:21 +00:00
Teddy
3315a510dc Barbarians stats added + Block break stat tracker added 2016-01-15 13:01:26 +00:00
Teddy
6a3e9ac19f BaconBrawl stats added 2016-01-15 12:10:53 +00:00
Shaun Bennett
404e049c31 Give item fix for offline players 2016-01-14 08:06:27 -05:00
Mysticate
cf7f5af9ca Fixed who the winner is in MB Games. 2016-01-14 07:41:36 -05:00
Mysticate
2e433d8b06 Made sure that the active morph gets disabled on clear 2016-01-14 07:17:40 -05:00
Teddy
d33d682ebb Implementing stats for every game, got all stat names ready 2016-01-13 18:40:29 +00:00
Virizion
ee6425bbaf Removed extra blank lines. 2016-01-12 23:31:35 -05:00
Virizion
dfd5a63b78 More changes and fixes. 2016-01-12 23:29:08 -05:00
fooify
63897b9b54 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-12 20:05:34 -08:00
Virizion
528a7435e7 Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder 2016-01-12 20:25:08 -05:00
Virizion
b27d5849d8 General fixes. 2016-01-12 20:23:25 -05:00
Teddy
f1314d5c26 JSON now handled by JsonMessage Builder 2016-01-12 13:25:47 +00:00
libraryaddict
b1c6af4d1a Update CB 2016-01-12 20:18:03 +13:00
NewGarbo
ed8d9459b2 goes with the commit below VVVV 2016-01-12 07:02:19 +00:00
NewGarbo
d3452772ed outposts work (grr git is weird trying to switch over to clans/beta) 2016-01-12 07:02:03 +00:00
NewGarbo
c873b6b886 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-12 06:58:53 +00:00
libraryaddict
c3e11e87ea Fix small issues with burning and ignition 2016-01-12 19:10:32 +13:00
libraryaddict
11da5a3fe1 Fix fire combusting and cancelled damage events 2016-01-12 18:56:48 +13: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
Shaun Bennett
025b87c806 Merge pull request #121 in MIN/mineplex from feature/mutedsign to develop 
* commit 'fa7eef504597011da14093fb76a8e088524eafd0':
  Muted players can't write on signs.
 2016-01-11 16:23:34 -06:00
Teddy
88c53bf464 Added default ChatStat for all games to prevent my server from dying when testing 2016-01-11 19:35:00 +00:00
NewGarbo
d656c7a212 fixed clans banned players counting as being online after joining and their territory then being blown up 2016-01-11 18:02:03 +00:00
Teddy
02ff8bdbdb Custom stats working, escaping bug fix and List reset bug 2016-01-11 12:59:57 +00:00
Teddy
40d913beaf Changed a List to reset each time its registered to prevent stats copying to the next game, automatic string escaping, party colour name changed to original colour 2016-01-11 12:35:44 +00:00
Teddy
b9d44d9a24 not updating properly, fixed 2016-01-11 12:14:29 +00:00
Teddy
78eaee98df Typo mistake 2016-01-11 12:09:08 +00:00
Teddy
ec6e916c7b more stable, progress for making 'easier-to-use' 2016-01-11 12:06:30 +00:00
NewGarbo
3773ab3f0b fixed safelog npcs sticking around some time 2016-01-11 10:14:32 +00:00
NewGarbo
60a78e396f remove legendary announcement in chat/middle text 2016-01-11 09:16:11 +00:00
Shaun Bennett
6c055c31a0 Fix flashing through doors, Update to 0.18c 2016-01-10 20:39:56 -05:00
NewGarbo
d5b5ac7bb0 changed regen level on giants broadsword from 4 to 3 and made slowness last longer so that screen doesn't glitch out 2016-01-10 23:06:39 +00:00
NewGarbo
d4ccb82791 didn't push this earlier 2016-01-10 23:03:16 +00:00
NewGarbo
6673081fb3 fixed LeechingAttribute from throwing an error when setting health above 20 2016-01-10 22:31:51 +00:00
NewGarbo
04c7f2c1f1 made pressure plates, buttons, and levers from working with block toss 2016-01-10 22:20:50 +00:00
NewGarbo
bccee71ff7 made signs placed by muted players get cleared on being placed 2016-01-10 21:16:49 +00:00
NewGarbo
734351011a made all old clans ban clients get unloaded. there seems to have been problems with certain clients not unloading. 2016-01-10 21:15:50 +00:00
NewGarbo
9c3a62a308 made it so punished players can't place signs 2016-01-10 21:03:34 +00:00
NewGarbo
68808efb49 made players not be able to chat while chat is silenced 2016-01-10 20:57:12 +00:00
NewGarbo
fa3de2a479 made clans ban messages not public 2016-01-10 20:55:29 +00:00
NewGarbo
51872faa04 fix mutes not working 2016-01-10 20:53:55 +00:00
Mysticate
fa7eef5045 Muted players can't write on signs. 2016-01-10 13:13:38 -05:00
Teddy
5caeb8bee0 even nicer visual 2016-01-10 17:34:15 +00:00
Teddy
c814132b24 ratio's and nicer visuals 2016-01-10 17:33:18 +00:00
Teddy
83375a6883 stats not updating 2016-01-10 16:01:40 +00:00
Teddy
1bce624ab3 Finally got rid of MalformedJSON 2016-01-10 15:13:11 +00: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
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
fooify
942460b471 Merge remote-tracking branch 'origin/develop' into bugfix/foo 2016-01-09 13:05:44 -08:00
Teddy
263e1326cd JSON progress 2016-01-09 20:22:29 +00:00
NewGarbo
fa509f0043 fixed giant's broadsword giving HUGE regen. PLEASE PUSH ASAP 2016-01-09 19:58:31 +00: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
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
Teddy
43fb04b482 Import clean up 2016-01-08 13:46:57 +00:00
Teddy
78405749a4 Changed TreasureShard rewarding, removed Queue 2016-01-08 13:46:39 +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
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
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
Teddy
6bf0970dbe Unused import removed 2016-01-07 19:52:04 +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
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