Commit Graph

4852 Commits

Author SHA1 Message Date
Sam 2e3d19bd3a Bug fixes 2017-05-04 21:49:44 +01:00
Sam f6cb654e12 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-04 20:20:59 +01:00
Sam 3210843395 Capture point fix 2017-05-04 20:20:48 +01:00
Sam 8f01015df9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/moba 2017-05-04 17:35:41 +01:00
Sam ee0971443e Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-04 17:32:16 +01:00
Sam 8032133f4d Sort the scores 2017-05-04 17:16:16 +01:00
Sam 808885ea04 Add leaper kit 2017-05-04 17:15:55 +01:00
Sam 47c816087e MOBA base 2017-05-04 15:45:04 +01:00
cnr 779256e1ca Enable the Skyfall booster kit 2017-05-03 18:45:39 -07:00
Sarah 4da069b244 Fix Booster Kit making you fly 2017-05-03 18:44:53 -07:00
cnr 3d37fab71f Disable movement checks in Dragons 2017-05-03 18:44:05 -07:00
Sam bd52e63dc3 More alien stuff 2017-05-03 20:48:19 +01:00
Sam 10258d66b8 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/alien-invasion 2017-05-02 23:18:38 +01:00
LCastr0 4e56d2133b Merge branch 'develop' into update/mayitems 2017-05-02 19:13:43 -03:00
Sam 034837030d Initial commit 2017-05-02 21:01:17 +01:00
cnr 2a92d312b2 Merge branch 'update/kingppc' into develop 2017-05-01 22:07:46 -07:00
Sarah 4652b09f78 Change /ea message layout, make /ea not usable by muted players, make /ea not usable without content and fix hub forcefield for event mod 2017-05-01 22:06:30 -07:00
LCastr0 923f991df3 Merge branch 'develop' into update/kingppc 2017-05-02 00:09:19 -03:00
LCastr0 030157fdb5 Fix constructors 2017-05-01 23:18:03 -03:00
Sam 41b7e4bf38 Fix Zombie's Deaths Grasp hitting spectating players 2017-05-01 14:26:41 +01:00
Sam b89e3c4abc Sheep code cleanup 2017-05-01 14:10:08 +01:00
Sam 0f1cea013c Guardian changes 2017-05-01 14:05:18 +01:00
Sam ff93ca9705 Pig changes 2017-05-01 13:48:49 +01:00
Sam 5138e6ad54 Blaze changes 2017-05-01 13:48:41 +01:00
Sam 76835654e8 Chicken, unless cast 2017-05-01 13:48:32 +01:00
Sam 110d8946d5 Zombie changes 2017-05-01 13:48:09 +01:00
Sam cc3ac9800b Skeletal horse changes 2017-05-01 13:48:01 +01:00
Sam 607893a872 Cow changes 2017-05-01 13:47:52 +01:00
Sam 3c852f091d Witch changes 2017-05-01 13:13:40 +01:00
Sam 69ed0c7c24 Magma Cube changes 2017-05-01 12:07:47 +01:00
Sam 20c05518f3 Wolf changes 2017-05-01 12:07:35 +01:00
Sam 9c9200605a Creeper Sulphur Bomb changes 2017-05-01 11:10:29 +01:00
Sam 1cc9888e58 Creeper Explode damage reduction 2017-05-01 11:10:19 +01:00
Sam 0f925dd655 Ink Blaster changes 2017-05-01 11:10:06 +01:00
Sam 6d4a68acdf Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:41:49 +01:00
Sam 8c2b8935df Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-05-01 10:37:13 +01:00
Sam 6d105a0499 All remaining kits converted to Google Sheets 2017-05-01 10:37:11 +01:00
Sam 0f5fcc7670 Remove entity bots 2017-05-01 10:36:45 +01:00
cnr e65f269a9a Merge branch 'update/kingppc' into develop 2017-04-30 21:11:37 -07:00
cnr 63fae06831 Revert "Enable 2x XP"
This reverts commit 7994ed082e.
2017-04-30 21:09:11 -07:00
LCastr0 a37cf3b1c5 Fixed pets and mounts not having any message when they are inside castle, fixed item despawning, stopped players from placing jukeboxes inside castle 2017-04-30 19:33:38 -03:00
LCastr0 0b2d0d348c Merge branch 'develop' into update/mayitems 2017-04-30 13:38:26 -03:00
LCastr0 91fb50cc8b Fixed conflicts 2017-04-30 12:05:04 -03:00
cnr 6ae6f7b627 Revert "Rate limit book/sign edits as a temporary measure against a crash exploit"
This reverts commit f5cba1eb1e.
2017-04-30 01:54:43 -07:00
Sarah fdee6b1163 Add some more event commands, fix some existing event commands and change permissions for event related commands to be executeable by EVENT_MODERATOR 2017-04-30 01:38:04 -07:00
Sam 0bbd0659a0 Fix the water not being replaced bug 2017-04-30 01:38:04 -07:00
Sam fd31706333 5 seconds rather than 50 2017-04-30 01:38:04 -07:00
Sam ee7a29d387 Stop command spam 2017-04-30 01:38:04 -07:00
Sam f315689dda Staff Oscars 2017-04-30 01:38:04 -07:00
Sam ee8f970673 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-29 23:40:16 +01:00
Sam acb5963dd4 Balance changes 2017-04-29 23:25:13 +01:00
Kenny 26c772b8b8 Merge branch '2xXP' into develop 2017-04-29 02:19:40 -04:00
Kenny 7994ed082e Enable 2x XP 2017-04-29 02:16:31 -04:00
Kenny f5cba1eb1e Rate limit book/sign edits as a temporary measure against a crash exploit 2017-04-29 02:05:07 -04:00
Sam 8a54e19695 Fix Fissure skipping snow blocks 2017-04-28 19:30:19 +01:00
Sam 6beeec20d6 Disable morphs when changing kits 2017-04-28 19:30:00 +01:00
Sam 26d97bf7eb Up the water damage check rate 2017-04-28 19:29:23 +01:00
Sam 59699f930e Re-implemented triple jumps 2017-04-28 16:26:02 +01:00
LCastr0 d33aac9fd4 Fixed args 2017-04-27 16:34:35 -03:00
LCastr0 124d22ce31 Added new class for peasants 2017-04-26 22:52:40 -03:00
LCastr0 6bf1b6c1dc Fixed arguments 2017-04-26 16:25:32 -03:00
Sam d3cb99f431 Skeletal Horse converted to Google Sheets 2017-04-26 19:11:48 +01:00
LCastr0 19138eb501 Added castle stuff for hub 2017-04-26 01:12:43 -03:00
Sam 7f1b1d72b9 Chicken converted to Google Sheets 2017-04-25 19:33:00 +01:00
Sam af25aa0b00 Witch converted to Google Sheets 2017-04-25 18:20:34 +01:00
Sam 044a3754cf Fix incorrect key 2017-04-24 23:14:01 +01:00
Sam f16ea648f9 Blazr converted to Google Sheets 2017-04-24 23:13:03 +01:00
Sam 99fa347cf1 Wolf converted to Google Sheets 2017-04-24 20:21:19 +01:00
Sam 27cff85189 Fix Perk variables being overriden when multiple kits used the same perk 2017-04-24 18:04:16 +01:00
Sam 5bc2b9d34c Revert "Make Perks not static, this fixings all kits having the same stats 😨"
This reverts commit 1d0f28689f.
2017-04-24 17:40:48 +01:00
Sam 1d0f28689f Make Perks not static, this fixings all kits having the same stats 😨 2017-04-23 19:06:33 +01:00
Sam c8d891ef31 Snowman converted to Google Sheets 2017-04-23 18:54:29 +01:00
Sam 9e6ab9a696 Enderman converted to Google Sheets 2017-04-23 17:07:45 +01:00
Sam 24b73d27e7 Fix the infinite Giga Slime 2017-04-23 16:10:54 +01:00
Sam 9d48a5f1a5 Creeper converted to Google Sheets 2017-04-23 16:08:45 +01:00
Sam 02ffec8618 Fix players being affected by velocity inside on the spawn island 2017-04-23 14:42:26 +01:00
Sam 09300b499f Adjust the time before the player recieves kit information after death 2017-04-23 14:41:59 +01:00
Sam f1b45bc29e Slime converted to Google Sheets 2017-04-23 14:37:29 +01:00
Sam 43d703d9b7 Spider converted to Google Sheets 2017-04-22 23:53:01 +01:00
Sam 1d7fb77bc4 Deleted some code by accident 2017-04-22 23:10:08 +01:00
Sam e350c62f54 Iron Golem and Skeleton converted to Google Sheets 2017-04-22 23:07:44 +01:00
Sam 2f478e46f3 Fix various bugs found in testing 2017-04-21 21:53:16 +01:00
Sam ca6789d92a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2017-04-21 17:35:12 +01:00
Sam 01f74a3e12 SSM Training Ground 2017-04-21 17:35:10 +01:00
Sam 30fb899bee Move debug commands over to the proper system 2017-04-20 18:26:22 +01:00
cnr 87b829b411 Disable easter egg baskets in games 2017-04-19 22:33:32 -07:00
cnr 2263e8bfcb Ignore movement checks in Runner 2017-04-16 01:09:12 -06:00
cnr b30a706543 Disable Skyfall booster kit 2017-04-14 22:33:54 -06:00
cnr c7e855ee16 Merge branch 'feature/eastereggs' into develop 2017-04-13 22:56:41 -06:00
samczsun 498df70a1f Implement basic canDamage 2017-04-13 00:02:32 -06:00
cnr 490fe56b34 Merge branch 'update/skyfall-nolag' into develop 2017-04-12 23:39:01 -06:00
samczsun e1fee19aff Optimize chunk updating and fix invis players 2017-04-13 01:09:05 -04:00
Sarah 4775fccb9a Improve Island rot and misc fixes 2017-04-12 22:35:33 +02:00
AlexTheCoder 5a225b9332 Properly check the spring chest rewards 2017-04-12 16:01:24 -04:00
AlexTheCoder fe1cda820f Merge branch 'update/aprilchest' of github.com:Mineplex-LLC/Minecraft-PC into feature/eastereggs 2017-04-12 16:00:37 -04:00
AlexTheCoder c3ff494f94 Update Arcade and Hub to use skinned easter eggs 2017-04-12 03:06:32 -04:00
LCastr0 1904990f84 Fixed merging issues 2017-04-11 23:16:42 -03:00
AlexTheCoder 9a58cd792e Implement easter egg baskets in games which can give fantastic rewards 2017-04-11 20:18:09 -04:00
LCastr0 6f1c062182 Removed GameType, using GameDisplay instead 2017-04-08 23:06:55 -03:00
LCastr0 8bcb5bc948 Added event to be called when game stops 2017-04-07 14:13:53 -03:00
LCastr0 b441dc5edf Calls event when arcade game starts 2017-04-07 14:12:23 -03:00
LCastr0 6a668004e0 Added game start event to core, to be called inside arcade and handled inside core 2017-04-07 14:06:44 -03:00
Sam 08bd17afe6 Fix a chat formatting problem 2017-04-06 00:36:17 -05:00
samczsun 0cc7a078c6 Fix bad logic in TeamArmorModule 2017-04-06 00:35:49 -05:00
samczsun 36f4e6b5a1 Change more closeInventory calls 2017-04-06 00:35:49 -05:00
samczsun 8e92317b9c So that's why Tim closed inventories 2017-04-06 00:35:49 -05:00
samczsun 9c9d74f098 PC-1394 2017-04-06 00:35:49 -05:00
samczsun fceda64a5a PC-1318 2017-04-06 00:35:49 -05:00
samczsun d69c4b3dca PC-1189 2017-04-06 00:35:49 -05:00
samczsun 4553a7081f PC-697 PC-1180 2017-04-06 00:35:49 -05:00
samczsun e0706f3627 PC-1056 2017-04-06 00:34:34 -05:00
samczsun db59c32b5e PC-1028 2017-04-06 00:34:34 -05:00
samczsun 873cd9c2a5 PC-802 2017-04-06 00:34:34 -05:00
cnr a1fc6bd20f Merge remote-tracking branch 'bugfix/bridges' into develop 2017-04-06 00:33:47 -05:00
cnr 64d5fe3c80 Revert "Revert "Merge branch update/bridges into develop""
This reverts commit 0ad69ebefc.
2017-04-06 00:33:41 -05:00
Sam cbf7985773 Colour the message 2017-04-05 22:58:06 +01:00
Sam c1b83b1065 Braces 2017-04-05 21:46:22 +01:00
Sam 047ed81eea Add a message when a player dies pregame 2017-04-05 21:38:04 +01:00
Sam 1f1ad4c441 Change Diamond ore drops to diamonds 2017-04-05 21:35:04 +01:00
Sarah acd588ff1a Add lucky/unlucky tracks to Skyfall 2017-04-05 04:40:52 +02:00
Sarah e4b79a3731 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
Sarah 616e2dad0f Fix selection of air blocks when searching for top layer blocks
add some Supply Drop loot
dd /Boost command, fix AntiCheat
don't put duplicates in supply drop
don't crumble rings before the game begins
don't crumble middle rings
2017-04-05 04:15:48 +02:00
samczsun ef21106da0 Fix memory leak in CompassModule 2017-04-01 16:20:59 -05:00
Sam 4c882ae4a8 Fix chat handling elsewhere 2017-04-01 02:11:11 -05:00
Sam 03d781ca70 It be April fools matey, walk yee plank 2017-04-01 02:11:11 -05:00
samczsun c82697a4e3 PC-1396 2017-03-29 23:30:49 -05:00
samczsun 53d9a5f977 PC-1222 2017-03-29 23:30:49 -05:00
samczsun ca452463db PC-1106 2017-03-29 23:30:49 -05:00
samczsun 3ef8c6f532 PC-1101 2017-03-29 23:30:49 -05:00
samczsun 8226592caa PC-1026 2017-03-29 23:30:49 -05:00
samczsun 8a78f1ce34 PC-1026 2017-03-29 23:30:49 -05:00
samczsun 858b08e3c3 PC-825 2017-03-29 23:30:49 -05:00
samczsun 8521691cfb PC-817 2017-03-29 23:30:49 -05:00
samczsun c95fea066c PC-778 2017-03-29 23:30:49 -05:00
samczsun e45e27ba34 PC-629 2017-03-29 23:30:49 -05:00
samczsun 66e3a7ad5c PC-587 2017-03-29 23:30:49 -05:00
samczsun 1ecd46f7ee PC-372 2017-03-29 23:30:49 -05:00
Sam fff18ef2a0 Revert "Make appler ignore damage rate"
This reverts commit e0819bfd7d.
2017-03-27 19:19:45 +01:00
Sam e0819bfd7d Make appler ignore damage rate 2017-03-27 19:14:07 +01:00
Sam 421d76b7f3 More changes! 2017-03-27 19:08:31 +01:00
Sam 28fa092b20 Additional kit changes 2017-03-26 13:39:12 +01:00
Sam 60231c817f Missed a class 2017-03-25 16:05:58 +00:00
Sam 02a6f34bd3 Destructor changes 2017-03-25 16:05:16 +00:00
Sam 5564dc7daf Fix even more bugs 2017-03-25 13:57:20 +00:00
Sarah b389041392 Change some more loot, not weapon doubles, 25% more boost from booster rings, fixed decay times for rings, let the complete surface of islands rot at once, specific items come with another item and a dynamic rot rate 2017-03-24 18:04:44 +01:00
LCastr0 d2851b0708 Merge branch 'develop' into update/aprilchest 2017-03-24 14:01:15 -03:00
Sam 8bddad44da Bridges hotfix 2017-03-24 16:46:14 +00:00
cnr 0ad69ebefc Revert "Merge branch update/bridges into develop"
This reverts commit 7e8f5b4939, reversing
changes made to 222e4267d2.
2017-03-23 23:24:00 -05:00
AlexTheCoder 3ebfb453c5 Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag 2017-03-23 23:18:29 -05:00
Sam 401276d705 Missing isLive check 2017-03-22 23:04:50 +00:00
Sam 1c620048ca Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-22 14:14:30 +00:00
Sam c4c7ebe1e6 Check for blocks already registering 2017-03-20 22:10:20 +00:00
LCastr0 defece04a9 Fixed some issues changing Creature to Entity 2017-03-20 16:33:20 -03:00
Sarah f8f7c04f58 Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top 2017-03-20 19:18:33 +01:00
cnr 441e2ab30f Disable 2x XP 2017-03-20 01:19:21 -05:00
Sam 95d919a654 Removed was werid disjointed code 2017-03-19 00:07:23 +00:00
Sam 05bd93cbdf Fixed Death Bomber achievement exploit 2017-03-19 00:01:11 +00:00
Sam df8ed90138 Ops, forgot to enable reports. Eclipse is bad 2017-03-18 23:44:42 +00:00
Sam b1a1faacb1 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-17 17:03:55 +00:00
Sam 8e5a5695d5 Fix early game revive 2017-03-17 17:03:53 +00:00
samczsun db2feeac42 Reorganize tracks, add BotB track 2017-03-15 23:16:07 -05:00
cnr e5d2ad34eb Merge branch 'update/stpatrickscosmetics' into develop 2017-03-15 23:15:10 -05:00
samczsun 4778d28be4 Allow overriding enabled team armor 2017-03-15 23:13:42 -05:00
Sarah 4f9cf987bd Change block rates and add Rate command 2017-03-15 21:30:48 +01:00
Sarah 1a061f6e2f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/compass/CompassAddon.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Skyfall.java

Rot starts at 2 minutes, Rings take 3 Minutes to rot, Top Island rots now, rings rot now
2017-03-15 17:38:07 +01:00
Sam 15d691370d Configuration for bridges 2017-03-14 21:05:52 +00:00
LCastr0 a3861d43c4 Fixes costume throwing items without complete set 2017-03-14 13:32:49 -03:00
Sam c8a9cffcdf Edit the documentation for per player world borders 2017-03-14 16:08:31 +00:00
Sam a49b19ee0c Removal of kit progression from bridges 2017-03-14 16:08:16 +00:00
Sam 1e43398875 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-03-14 15:53:27 +00:00
cnr 3dc36449b5 Add 2x XP and open Gem Hunters beta
This is for spring break, and ends 3/19
2017-03-10 00:29:11 -06:00
samczsun 888761d15e Somehow missed Team Super Smash 2017-03-09 01:06:53 -06:00
samczsun b5f026d4c0 Removem misleading comment 2017-03-09 01:06:53 -06:00
samczsun a99cb6579d PC-814 2017-03-09 01:06:53 -06:00
samczsun 4be4fcb434 Fix Team Armor Addon (also PC-201) 2017-03-09 01:06:53 -06:00
AlexTheCoder a691d58840 Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper! 2017-03-09 01:04:50 -06:00
cnr 06a71946a0 Publish server status earlier during startup
Servers are allowed ten seconds to publish their status on startup by
ServerMonitor. NpcManager can consume most or all of that allotted time
on EU, so we need to initialize ServerStatusManager first.
2017-03-03 08:15:56 -06:00
samczsun b782f5ced9 Speed up generation 2017-03-01 23:58:20 -06:00
samczsun 3e8b23c6f4 Sentry Issue #223473496
Don't bother with failsafe if the game is null (i.e. beyond dead)

Steps to reproduce:
1) Quit server at just the right time
2017-03-01 23:54:02 -06:00
samczsun 3f40432268 Sentry Issue #223474603
Handle null gun in Minestrike

Steps to reproduce:
1) Bring a player down to low health using a molotov
2) Kill them with a grenade
2017-03-01 23:54:02 -06:00
samczsun 9571db123d Sentry Issue #223483175
Fix badly implement Player check in PerkBoneRush

Steps to reproduce:
1) Pick Skeletal Horse
2) Bone rush on some mob (i.e. cows in swamp)
2017-03-01 23:54:02 -06:00
samczsun cb9ac1fc9f Sentry Issue #223481030
Prevent Fish Flurry from activating if no suitable blocks are found

Steps to reproduce:
1) Select squid on hyrule castle
2) Activate fish flurry while looking at middle of empty side of castle
2017-03-01 23:54:02 -06:00
samczsun 7e9211815f Sentry Issue #223481223, #223481117
Reverse check so RHS can be null

Steps to reproduce:
1) Pick Wither Skeleton in SSM
2) Throw wither image away from other player so it has no target
3) When it's standing still (i.e no target), have the other player punch
the image
2017-03-01 23:54:02 -06:00
samczsun 0725639852 Sentry Issue #223596821
Check if player has left before performing actions

Steps to reproduce:
1) Pick wolf in SSM
2) Hit someone
3) Quit immediately after
2017-03-01 23:54:02 -06:00
samczsun 2e23d59702 Sentry Issue #223489411
Check if fired projectile is a WitherSkull before casting

Steps to reproduce:
1) Go to Wither Assult
2) Fire enderpearl
2017-03-01 23:54:02 -06:00
cnr 699845d6d7 Merge branch 'feature/gem-hunters' into develop 2017-02-25 00:40:05 -06:00
cnr 7de556e3d8 Allow plugins to choose a hub type when restarting
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00
Sam 3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
Alexander Meech 1736b198f2 Fix Twitch+ Mps not properly showing information via MOTD 2017-02-09 22:44:18 -06:00
Nate Mortensen 9444da9dae Fix item drop check in Wizards
Currently players are unable to drop items if the held item
slot is below 5.  This works fine when dropping items simply
by pressing q, but it often interferes with players dropping
items from an open inventory.  This commit changes the check
to iterate over the first five slots and only cancel the event
if they're dropping one of them.
2017-02-08 22:32:57 -06:00
Nate Mortensen abbb46ec0a Fix the death message when using Summon Wolves 2017-02-08 22:32:57 -06:00
Nate Mortensen 1425a2aaed Fix Rumble spell slowness level 2017-02-08 22:32:57 -06:00
Nate Mortensen b90e879d4b Fix protection provided by Gold armor in Wizards
While the name of the gold items is "Golden X", the
name of the material is "GOLD X" resulting in gold items
providing no protective benefit other than the default
vanilla protection(in the case of there being only gold
armor).
2017-02-08 22:32:57 -06:00
Nate Mortensen 4031b037de Correct damage for Fireball and AnvilDrop
This issue came down to two bugs with the explosions created
by Fireball and AnvilDrop.

The first was the damage being done.  Settings the max damage
doesn't change the base damage, so they did the default amount
of damage based on the vanilla code.

The second was the radius of the explosion.  The radius was
too small, and so it was perceived that only users directly hit
would suffer damage.  The radius was increased, however the block
explosion size was kept the same.
2017-02-08 22:32:57 -06:00
Nate Mortensen 941be75161 Allow spells to be learned from double chests 2017-02-08 22:32:57 -06:00
Alexander Meech 6583e86ace Remove william's copyright file headers 2017-02-08 22:24:19 -06:00
Alexander Meech 908b282fdf Fix issue with spaces in ChooseMapButton 2017-02-08 22:24:19 -06:00
Sam 2f9f55226a Adjust world border distance 2017-02-07 00:05:10 +00:00
Sam 3018f264cc QA ready! 2017-02-06 23:28:27 +00:00
Sam 36f318e4a0 KP Upgrades (1) 2017-02-06 21:00:30 +00:00
Sam 6cc5a14073 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-03 20:33:54 +00:00
Sam 13806a49d2 Bridges bug fixes 2017-02-03 20:33:21 +00:00
Sam 99ff344679 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/bridges 2017-02-02 13:20:14 +00:00
samczsun 8a3b531a06 Bawk Bawk Battles rewrite 2017-02-02 00:31:58 -06:00
Sam c6bb850bc3 Lots of stuff 2017-01-30 23:28:55 +00:00
Sam a62ecdb212 Custom Bridges and Per player world borders 2017-01-25 21:38:58 +00:00
Sam 3557fd8acc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-21 14:21:03 +00:00
samczsun 8b1fe8302e Match Bukkit tab completion behaviour 2017-01-20 01:27:58 -06:00
samczsun cc9f28dfec Fix holes in Skywars
Skywars's crumble affects any block which has been updated, including
blocks outside the game world. This commit checks if a block is in the
game world before crumbling it
2017-01-20 01:27:58 -06:00
samczsun 8479e80f8e Change intent of /hub to PLAYER_REQUEST 2017-01-20 01:27:58 -06:00
samczsun 8dc0961f03 Remove debug message 2017-01-19 23:12:29 -05:00
samczsun f83550157c PC-1034
The `z` variable wasn't being reset properly
2017-01-19 23:12:26 -05:00
samczsun 1ff05eb3ff Reset Magma Cube kill counter on game end 2017-01-19 23:12:11 -05:00
samczsun 7290b83466 Fix Skywars eating/bowing/whatevering bug 2017-01-19 21:24:50 -05:00
samczsun 5ca9b79333 Fix Fissure doing no damage 2017-01-19 18:49:51 -05:00
samczsun 343167245e Fix party chat 2017-01-19 18:16:43 -05:00
Sam 8a9a3cb2ac Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-19 21:16:12 +00:00
samczsun fd65f2df1b Tab completion for /game set 2017-01-18 23:34:57 -06:00
samczsun 6692432c42 Smart™ Tab Completion©® 2017-01-18 23:30:39 -06:00
samczsun e5ece844cb Tab completion 2017-01-18 23:20:56 -06:00
samczsun 1bb96625f7 Add missing import 2017-01-18 23:20:24 -06:00
samczsun 2ffae9f078 Enable strict anticheat in Gladiators (Artix) 2017-01-18 23:20:24 -06:00
samczsun ac63985419 Revert removing strict anticheat 2017-01-18 23:20:24 -06:00
samczsun 1ce69dfa14 PC-1054 PC-1164
GameTeam can't handle spawnpoints which are also solid blocks, and
SurvivalGames has a chance of spawning a chest on a spawn platform. When
this happens, the next closest spawn is always the same spawn because the
two players will be exactly 1 block apart, causing everyone to spawn at
the same podium. This commit prevents SurvivalGames from generating random
chests on spawn podiums
2017-01-18 23:20:24 -06:00
samczsun cc7150850c PC-221
In Block Hunt, hitting an entity will cause an "Cancelled Infection" event
to propagate upwards the stack. This commit checks whether the game is
live before beginning the cancellation
2017-01-18 23:20:24 -06:00
samczsun e309abc968 PC-1051 PC-1238
Some kits had armor in the wrong order, causing them to render
incorrectly. This commit reorders the armor.
2017-01-18 23:20:24 -06:00
samczsun 63357b0fc5 PC-1303
In the 1.11 update, the override was mistakenly toggled off while spawning
in skeletons. This commit undoes that change.
2017-01-18 23:20:24 -06:00
samczsun 8e5483e42b PC-190
Ignoring listened on too high of a priority and chat managers didn't
respect the recipients list. Those two issues have been fixed in this
commit
2017-01-18 23:20:24 -06:00
samczsun 0ae4bd2281 PC-938 PC-1294
For whatever reason, Minestrike nametags don't hide properly on
hotjoining. This is a simple fix which just resets all nametag
visibilities on game reset. Should work, right?
2017-01-18 23:20:24 -06:00
samczsun 2bac38385f PC-1299
In the 1.11 update, the override was mistakenly toggled off while spawning
in wither skeletons. This commit undoes that change.
2017-01-18 23:20:24 -06:00
samczsun 4cd643f64f PC-1040
In one of my previous commits, while migrating CompassAddon ->
CompassModule I accidentally removed two logical components. The first
prevented compasses from being given out in the pregame lobby, and the
second allowed players who were dead to receive compasses. Both have been
re-added.
2017-01-18 23:20:24 -06:00
samczsun 283dd23920 PC-1298
In the 1.11 update, the override was mistakenly toggled off while spawning
in horses. This commit undoes that change.
2017-01-18 23:20:24 -06:00
Sam 8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
samczsun 132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun e72d1e51a2 Ignore bypass for testing sever motd 2017-01-11 20:29:37 -06:00
samczsun 39ba03d1b4 Convert to UtilServer.isTestServer 2017-01-11 20:29:36 -06:00
samczsun 19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -06:00
Nate Mortensen e339b0352a Make GameComponent generic and store an instance of the Game. 2017-01-11 20:04:48 -06:00
samczsun 5c4cc48e86 More QA changes 2017-01-11 19:50:26 -06:00
samczsun 56d4ed9e11 Parties rewrite
Basically everything got changed. Also Portal has a slightly better API
now
2017-01-11 19:50:26 -06:00
cnr cea08cae67 Merge branch 'update/cosmetics-balloons' into develop 2017-01-11 15:32:41 -06:00
xXVevzZXx 1095f8bc49 Respack links 2017-01-11 15:29:50 -06:00
xXVevzZXx 5a2ed59a38 Make Strike Games an actual game, disable Hunger and remove food from loot 2017-01-11 15:29:50 -06:00
samczsun 99211d5d89 Fix particles 2017-01-11 15:11:57 -06:00
Nate Mortensen 9583c7abcb Run Minestrike in Adventure Mode 2017-01-11 15:07:48 -06:00
Nate Mortensen afaed17071 Fix kill reward for skinned knives 2017-01-11 15:07:48 -06:00
Nate Mortensen 8384c47e53 Create Lifetime system for managing Listeners with a defined duration.
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
2017-01-11 15:07:47 -06:00
LCastr0 21473a7d82 Fixed merge conflict 2017-01-10 21:27:47 -02:00
Sam 64026f81ff Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-08 21:12:28 +00:00
Sam 0218965bee Villager trading and loot upgrades 2017-01-08 15:44:04 +00:00
cnr 990c548e7b Disable Thanksgiving chickens 2017-01-06 01:06:10 -07:00
cnr f08068c717 Revert "Enable double XP + gems for the holidays"
This reverts commit d3bcc77e01.
2017-01-04 20:34:09 -07:00
cnr 3af401ee8f Implement two-factor authentication 2017-01-04 20:33:09 -07:00
LCastr0 7f7f3b9954 Removed thanksgiving chickens 2016-12-29 17:01:30 -02:00
LCastr0 4c6298bb63 Merge branch 'develop' into update/cosmetics-balloons 2016-12-29 16:28:13 -02:00
LCastr0 6478656501 Fixed armorstand balloon types 2016-12-29 16:25:20 -02:00
Sam 0ba22f9201 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-28 22:33:04 +00:00
cnr c7d5e149f8 Fix NullPointerException in speed builders 2016-12-28 15:18:59 -07:00
Sam 4c7f5c5716 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-27 18:59:03 +00:00
cnr d3bcc77e01 Enable double XP + gems for the holidays 2016-12-26 22:43:32 -07:00
Sam a4a039b619 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-25 22:09:03 +00:00
cnr ca19840b19 Revert "Disable communities temporarily."
This reverts commit 6d5d2b551b.
2016-12-22 16:50:35 -07:00
William Burns 6d5d2b551b Disable communities temporarily. 2016-12-22 17:07:36 +00:00
AlexTheCoder 941b33bcfc Replace Integer == with Integer.intValue() == so as to avoid edge case errors 2016-12-21 19:31:56 -07:00
AlexTheCoder 8bb279a8fb Remove game tips from MCS 2016-12-21 19:30:53 -07:00
AlexTheCoder 2611ba7a7a Bugfixes from iteration, & new features requested by sampson sigils and relyh 2016-12-21 19:30:53 -07:00
AlexTheCoder df3c2d5d67 Fix champions being permanently disabled 2016-12-21 19:30:27 -07:00
AlexTheCoder cbe1a617af Support the MCS in Arcade 2016-12-21 19:30:26 -07:00
LCastr0 36801283d7 Added method to disable taunts in certain games 2016-12-21 15:55:52 -07:00
LCastr0 f9c71c481f Fixed taunts, using armorstands instead of items
Removed minestrike chest (not being released this month)
2016-12-21 15:55:52 -07:00
LCastr0 69f7f025a1 Added the first taunt! 2016-12-21 15:55:52 -07:00
LCastr0 0af46005e7 Added Taunts :toot: 2016-12-21 15:55:51 -07:00
samczsun 7f3bb9671a Change thresholds, add notifs, move stuff around 2016-12-20 15:05:52 -05:00
samczsun ece4416c2e Metadata 2016-12-20 15:05:26 -05:00
samczsun 77f1f18f27 More metadata 2016-12-20 15:05:01 -05:00
samczsun 6970c3205e AntiHack Logging 2016-12-20 15:05:01 -05:00
samczsun 77da6ac2c2 Remove MAC 2016-12-20 15:05:01 -05:00
samczsun fd00644eb8 Finalize Titles 2016-12-14 19:56:27 -07:00
samczsun 4641ed828b Fix faulty scoreboard logic 2016-12-14 19:54:08 -07:00
samczsun d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
cnr b7e738b4e8 Revert commits from #302
This reverts commits from the range 062fdd3^..a0beeab

Changes from #302 are on hold until a later date.
2016-12-08 20:41:46 -07:00
Nate Mortensen 5c363d27fd Fix item drop check in Wizards
Currently players are unable to drop items if the held item
slot is below 5.  This works fine when dropping items simply
by pressing q, but it often interferes with players dropping
items from an open inventory.  This commit changes the check
to iterate over the first five slots and only cancel the event
if they're dropping one of them.
2016-12-07 13:20:04 -06:00
Nate Mortensen 66eeae2a54 Run Minestrike in Adventure Mode 2016-12-07 13:20:04 -06:00
Nate Mortensen ee6e6837ac Fix the death message when using Summon Wolves 2016-12-07 13:20:04 -06:00
Nate Mortensen 1a7965a954 Fix kill reward for skinned knives 2016-12-07 13:20:04 -06:00
Nate Mortensen a05b53c233 Fix Rumble spell slowness level 2016-12-07 13:20:04 -06:00
Nate Mortensen 0c71d5ef5d Fix protection provided by Gold armor in Wizards
While the name of the gold items is "Golden X", the
name of the material is "GOLD X" resulting in gold items
providing no protective benefit other than the default
vanilla protection(in the case of there being only gold
armor).
2016-12-07 13:20:04 -06:00
Nate Mortensen fb15264a69 Correct damage for Fireball and AnvilDrop
This issue came down to two bugs with the explosions created
by Fireball and AnvilDrop.

The first was the damage being done.  Settings the max damage
doesn't change the base damage, so they did the default amount
of damage based on the vanilla code.

The second was the radius of the explosion.  The radius was
too small, and so it was perceived that only users directly hit
would suffer damage.  The radius was increased, however the block
explosion size was kept the same.
2016-12-07 13:20:04 -06:00
Nate Mortensen 833c52d0f2 Create Lifetime system for managing Listeners with a defined duration.
This commit introduces a Component system focused around Games, which is completely
backwards compatible, as well as designed to be flexible enough for later improvements
such as dependency injection. Each GameState is associated with a phase of the
PhasedLifetime that each Game has. Components can be registered with a specific phased
or the entirety of the Lifetime. Refer to the javadocs for Lifetime and PhasedLifetime
for more details.  Currently the main two Component types are ICommand and
ListenerComponent.

This commit includes the first refactoring into using this system, which is replacing
the Wizards minigame's usage of Miniplugin with a Lifetimed Component, allowing for
the shop to be appropriately registered and unregistered.  This change allows for
Wizards to be run more than once on the same server instance.  Previously, attempting
to register the Miniplugin twice would result in the minigame failing to start after
the initial registration.

This commit additionally includes slight refactoring within GameCreationManager as
required for the Lifetime system to function correctly.  These changes ensure that
Games are only disabled once, whereas before they could be repeatedly disabled.
The previous implementation of disable(), along with the classes that override it,
functioned correctly despite being called several times.

Finally, this commit adds in changes to the pom to allow for unit testing.
2016-12-07 13:20:04 -06:00
Nate Mortensen 062fdd31b2 Allow spells to be learned from double chests 2016-12-07 13:20:04 -06:00
samczsun 20697982e7 Create Rank ScoreboardTag to fix Name collision 2016-12-07 13:05:54 -06:00
Alexander Meech 1ab800afb8 Remove time portion from scoreboard when ending is reached 2016-12-04 01:59:28 -05:00
Alexander Meech aa3a8104d2 Toggle reached ending setting on last stage 2016-12-04 01:57:57 -05:00
Alexander Meech d1a084b66e Add a reached ending setting to Christmas Chaos 2016-12-04 01:55:46 -05:00
LCastr0 97ce2d0ae6 Gingerbread Cosmetics
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
2016-12-01 23:39:33 -06:00
cnr fa0e42a918 Revert "Anticheat Logging #299"
This reverts commit cae9d2f67e.
2016-12-01 01:59:50 -06:00
LCastr0 64949678f8 Added Santa Morph to the menu
Disabled spawning Baby Zombie Jockey near water
2016-12-01 01:42:29 -06:00
cnr cae9d2f67e Anticheat Logging #299
Remove MAC
Add AntiHack Logging
Change thresholds, add notifs, move stuff around
Add warning if check does not exist
Handle multiple bans when ranked TWITCH+
Prevent punishment abuse
2016-12-01 01:24:05 -06:00
AlexTheCoder df741fd394 Fix UtilVariant and disable Thanksgiving Chickens in Christmas Chaos 2016-12-01 01:22:32 -06:00
AlexTheCoder e8cc23279f Start debugging CC 2016-12-01 01:22:32 -06:00
AlexTheCoder df48369e70 Revamp original Pumpkin King morph, add a new Christmas King Morph, and make the Christmas King morph the new reward for Christmas Chaos 2016-12-01 01:22:32 -06:00
AlexTheCoder 72669c7640 Remove malfunctioning visibility refreshers and block direct connection to Clans servers for non-staff 2016-12-01 01:20:18 -06:00
Sam 6d1c368452 Fix no drops 2016-11-30 20:23:45 +00:00
Sam a7143897a0 Vertical Border and achievements fix 2016-11-30 19:52:27 +00:00
Sam 60c1d747c5 Remove PackMaster Achievement 2016-11-30 17:37:50 +00:00
Sam bb7191504c UHC Achievements 2016-11-26 00:40:19 +00:00
Sam ddab450c8e Another border size problem... 2016-11-25 00:44:13 -05:00
Sam f2eb1209db Wrong border size 2016-11-25 00:44:13 -05:00
Sam 4158d09106 UHC Bug fixes! 2016-11-25 00:44:13 -05:00
AlexTheCoder 6fefd71bb8 Remove all chickens on game state change and stop chickens spawning in any UHC type 2016-11-25 00:41:47 -05:00
cnr 3f72ded65e Revert "Retry CTF proxy fix"
This reverts commit 67a663891e.
2016-11-24 06:49:26 -06:00
cnr 5e218d019c Set view distance before loading UHC worlds 2016-11-24 04:50:54 -06:00
Shaun Bennett 4ffe9ef220 Disable UHC in player servers (temporary) 2016-11-24 04:57:21 -05:00
Shaun Bennett 8d9f697bdd Fix SkyWarrior Kit 2016-11-24 00:50:03 -05:00
Shaun Bennett 8882bfee5c Merge remote-tracking branch 'remotes/origin/develop' into update/uhc-moppletop
* remotes/origin/develop:
  Set up support server with Thankful Chest tracking and Eternal Rank
  Add Cake Mount and implement it in Thankful Chest
  Use getName() instead of a String
  Enable MountChicken with some small modifications and add it to Thankful Chest
  Implement Thankful chest, patch Trick or Treat chest showing as purchasable, make SubscriptionDuration enum public and static, and create a Power Play Reward
  Remove MCL and OITQP from the stats page
  Take a second crack at fixing invisibility across Arcade and Clans
  Properly block placement of redstone-based blocks in Clans
  Fix Clans servers not restarting every night, display an uptime notification whenever Clans servers shut down for any reason, and remove unnecessary onDisables from the main ClansManager onDisable
  Patch Frozen players in clans spawning CombatLog NPCs when leaving, patch ClansCommandExecutedEvent not always being called, clean up ClanBanner code, and make Freeze System and Nether Manager effectively block Clans Commands (particularly teleportation)
  Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI
  Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group

# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2016-11-24 00:48:15 -05:00
AlexTheCoder 0a458c150f Take a second crack at fixing invisibility across Arcade and Clans 2016-11-23 23:41:10 -05:00
AlexTheCoder c2de8c35e2 Fix game scoreboards breaking when given more than 15 lines and removed OITQ Payload from the server selection compass GUI 2016-11-23 23:41:10 -05:00
AlexTheCoder 1bbabe46f7 Patch Items with type FEATHER, BONE, or RAW_CHICKEN being automatically instantly removed, patch Carl the Creeper not viewing playwire as an available reward to inform players about, and patch Carl the Creeper not informing players of available rewards on Clans Hubs and Lobbies not included in the main server group 2016-11-23 23:41:10 -05:00
AlexTheCoder 44efedbc81 Fix HolidayManager being outdated 2016-11-23 19:11:44 -05:00
Shaun Bennett 15f3b19f8a Merge remote-tracking branch 'origin/update/uhc-moppletop' into update/uhc-moppletop
* origin/update/uhc-moppletop:
  Retry CTF proxy fix
  Eternal Giveaway Fixes
  Eternal giveaway refactoring
  Revert: Disable Fated giveaway tools for now
  Eternal Rank

# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
2016-11-23 18:11:26 -05:00
xXVevzZXx b42f3eb5fd Fix final bugs and improve island system 2016-11-23 19:56:46 +01:00
Shaun Bennett e892476ca0 Setup enderchest API 2016-11-22 08:17:24 -05:00
Sam 325c0ab56c Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-21 19:13:34 +00:00
Sam 92ed095e92 QA changes 2016-11-18 21:32:02 +00:00
samczsun 67a663891e Retry CTF proxy fix
But this time, let's allow deregistration even if it hasn't been
registered by us, because it auto-registered itself
2016-11-17 22:49:15 -05:00
Shaun Bennett 562d7de1a9 Eternal giveaway refactoring 2016-11-17 21:05:10 -05:00
Shaun Bennett cdfd030999 Revert: Disable Fated giveaway tools for now 2016-11-17 21:05:10 -05:00
Shaun Bennett 712019b45b Eternal Rank 2016-11-17 21:05:10 -05:00
xXVevzZXx 85d6452432 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-17 23:17:24 +01:00
Sam 0ca79f193f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 21:20:28 +00:00
Sam 53b67214fb More bugs 2016-11-17 21:20:00 +00:00
Shaun Bennett 10911c9a9c Revert CTF Proxy Fix 2016-11-17 16:17:39 -05:00
Sam 142cf4dd93 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-17 19:41:47 +00:00
Sam 78a123156a Memory leaks! 2016-11-17 19:38:07 +00:00
xXVevzZXx 26d8fe5e6e Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall 2016-11-17 19:19:28 +01:00
Shaun Bennett e845f7fca9 Disable Fated giveaway tools for now 2016-11-17 02:13:48 -05:00
LCastr0 b862a30c76 Thanksgiving Cosmetics (#278)
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...

* Fixed Pet menu
Fixed morph menu
Changed from List to Set

* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned

* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first

* Changed some stuff from Holiday Manager so now chickens will walk around when spawned

* Added sound effects to Metal Man
Added slowness to Metal Man

* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens

* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package

* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph

* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles

* Added hover ability to Metal Man Morph

* Fixed some stuff on Metal Man
2016-11-17 02:06:00 -05:00
Shaun Bennett cbc9aeedc6 Report Feature Improvements (#269)
Report Feature Improvements
2016-11-16 22:52:14 -05:00
Sam 22b7ce60eb For sam 2016-11-17 02:56:58 +00:00
AlexTheCoder 0070fed6c7 Fix playwire multithreading and convert to new 5-ticket per 24-hour system 2016-11-16 21:42:47 -05:00
Sam Sun 4709161180 Attempt to fix CTF Proxies (#280) 2016-11-16 21:40:42 -05:00
md-5 735550c157 Use Mineplex Pair Util Class in Halloween 2016 (#274)
JavaFX is not included in OpenJDK.
2016-11-16 20:29:33 -05:00
Sam 8d6eb13504 Add "%player% is your teammate" in 2 player team games (#273)
* Add "%player% is your teammate" in 2 player team games

* Add to Team Skyfall
2016-11-16 20:10:16 -05:00
Sam 51c7801a9f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-15 20:01:21 +00:00
cnr 70ca2c7964 Add 1.11 support 2016-11-15 13:58:31 -06:00
xXVevzZXx a74bc71018 fix bugs and make some improvements 2016-11-15 17:04:38 +01:00
Sam faba1f2369 Forgot the actual UHC class... 2016-11-13 12:35:48 +00:00
Sam efc73d220f Change how UHC handles time 2016-11-13 12:35:38 +00:00
Sam 07cd716cf7 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/uhc-moppletop 2016-11-13 10:37:21 +00:00
Sam aa4ef9f4ad Big bugs 2016-11-12 21:50:38 +00:00
Keir Nellyer 6e5db69b0c Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-10 13:52:44 +00:00
Sarah e71187aa33 Add new Brawl Games (#260)
* add more Brawl games

* fix some bugs in new brawl games

* fix even more bugs

* Fix some super paintstrike bugs

* Add some Javadoc
2016-11-09 20:38:49 -05:00
Nate Mortensen 3b83a9bdc3 Reformat Block Hunt 2016-11-08 10:44:39 -05:00
Nate Mortensen 6db79c3ca5 Remove disguises when players switch to Seeker 2016-11-08 10:44:39 -05:00
Nate Mortensen 0607355ee0 Prevent cloaked players from having their visibility reset 2016-11-08 10:44:39 -05:00
Nate Mortensen e3b701f948 Don't give infestors an initial disguise 2016-11-08 10:44:39 -05:00
Sam 6a9648e646 Solo Mode and Faster UHC 2016-11-05 11:06:12 +00:00
xXVevzZXx af7de62ff7 Fix non upgradeable perks being not unregistered 2016-11-04 06:02:13 -05:00
Keir Nellyer 407ec0d924 Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-11-03 20:11:21 +00:00
Nate Mortensen f587445ffc Remove extraneous horses when the game ends
When players using the horseman kit win a game,
they never die, which is the only time that spawned
horses are removed.  To fix this, at the end of the
game all horses belonging to players that have survived
are explicitly removed, which removes all remaining horses.
2016-11-02 17:01:17 -04:00
LCastr0 9267a36528 Disable Halloween 2016 (#261)
* Removed all the halloween related items:
 - Haunted chests can only be opened if player already had ammo
 - Removed Halloween theme from the hub
 - Removed pumpkins from in-game

* Added Halloween items to the Omega Chest

* Fixed weight for items in the omega chest

* Changed Disk to Disc in RewardManager
Changed values for omega rarities

* Final commit (removed win room test command)

* Removed Halloween words from Draw My Thing and Master Builders
2016-11-02 16:49:31 -04:00
Sarah afac2aea3f Skyfall Update (#262)
* Fix some bugs, improve Skyfall and add Skyfall Teams

* re-enable debug

* Fix Perks not being unregistered from the EventHandler

* Remove unused import

* Remove unused imports
2016-11-02 16:48:44 -04:00
Sam b122fba97e Fix arrows not getting removed! 2016-11-02 16:48:01 -04:00
samczsun 07c93606f8 GameChatManager: Check if the game exists 2016-10-28 17:57:25 -04:00
samczsun 873e93747e HolidayManager: Fix CME 2016-10-28 17:57:25 -04:00
samczsun 49c5df6e68 Parties: Check if target is null before inviting 2016-10-28 17:57:25 -04:00
samczsun 1d961c7d81 GamePlayerManager: Don't load kits if offline 2016-10-28 17:57:25 -04:00
samczsun d2a2fdfd46 UHC: Fix NPE
Players who joined after the gamestate has been set to PREPARE
should not be considered as in the game
2016-10-28 17:57:25 -04:00
samczsun a729b03ce7 UtilParser: Handle null lastDamageCauses 2016-10-28 17:57:25 -04:00
samczsun 0c1f6cbedc Rewrite CombatLogModule 2016-10-28 17:57:25 -04:00
samczsun 70ed2e4fbb CompassModule
Integrate with CombatLogModule
2016-10-28 17:56:46 -04:00
samczsun e8becf3819 Op on dev servers too 2016-10-28 17:56:08 -04:00
samczsun e7b744f527 UHC rewrite 2016-10-28 17:56:08 -04:00
Keir Nellyer 4b3cadbb5a Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/BuyChestButton.java
2016-10-27 23:53:32 +01:00
Shaun Bennett f06325d972 Super Smash Mobs Update (#243)
Update/ssm
2016-10-26 22:03:43 -04:00
Keir Nellyer f5a81f083e Merge branches 'develop' and 'update/report' of github.com:Mineplex-LLC/Minecraft-PC into update/report 2016-10-26 10:28:13 +01:00
cnr 44e016f272 Fix infinite loop in GameWorldManager 2016-10-25 01:44:07 -05:00
xGamingDudex eaee382e7f Small typo 2016-10-23 16:22:27 +02:00
xGamingDudex c0ec1e1ff7 Prevent infinite speed effect on creeper 2016-10-23 03:11:51 +02:00
xGamingDudex 7b7b7aadf8 Fix a notorious XP bug in the wolf kit 2016-10-23 01:28:57 +02:00
xGamingDudex 1a847862d5 Prevent sometimes duplicate usage of the snowman smash 2016-10-23 01:28:04 +02:00
xGamingDudex 4531902adc Prevent guardian abilities from affecting team mates 2016-10-23 01:27:34 +02:00
xGamingDudex 0306d0d9d1 Fix chicken rocket to deal damage and knockback 2016-10-23 01:27:09 +02:00
xGamingDudex 2d0d78e1b7 Prevent snowman smash from affecting self, and give 3 snowmen 2016-10-22 21:28:11 +02:00
Keir Nellyer e0d05d3c87 PC-1140 Keep reports region-separated 2016-10-22 15:06:18 +01:00
xGamingDudex 295f1f255f Fixed rare NPEs 2016-10-22 13:09:56 +02:00
xGamingDudex 720e965d08 Fixed chicken rocket. 2016-10-22 10:49:21 +02:00
xGamingDudex 4e433665cc Fixed golem smash affecting team mates 2016-10-22 10:49:02 +02:00
xGamingDudex 8414a17978 Don't apply velocity to team mates 2016-10-22 10:48:36 +02:00
xGamingDudex d2be1fc646 Don't set team mates on fire on direct fireball hit 2016-10-22 10:48:09 +02:00
xGamingDudex 1ae89adfb0 Remove debug messages 2016-10-22 09:40:06 +02:00
xGamingDudex cfd2343f0e Fixed zombie perk Deaths Grasp 2016-10-21 16:51:47 +02:00
xGamingDudex b8c474a92d Fixed daze potion 2016-10-21 16:51:29 +02:00
xGamingDudex bcfdfd4619 Added better team mate detection for team super smash 2016-10-21 16:51:16 +02:00
xGamingDudex ff1d29bd2e Apply wool bomb damage to self in team games 2016-10-21 01:37:14 +02:00
xGamingDudex 70d554fa2d Fixed witch daze potion 2016-10-21 01:12:02 +02:00
xGamingDudex ca0f36d142 Prevent armorstand used by laze to block projectiles 2016-10-21 00:55:44 +02:00
xGamingDudex 45c5ba66bd Prevent multiple perks from affect team mates and cleaned up some code 2016-10-21 00:55:18 +02:00
xGamingDudex c8edc2d01e Rewrote daze potion damage calculations 2016-10-21 00:54:04 +02:00
xGamingDudex 6a6a589cb7 Fixed wolf cub sometimes not being removed 2016-10-21 00:25:37 +02:00