Commit Graph

4285 Commits

Author SHA1 Message Date
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
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
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
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
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
xGamingDudex db3106d8a4 Prevent golem fissure from effecting team mates 2016-10-20 23:20:26 +02:00
xGamingDudex d26103d321 Increase Whirlpool damage 2016-10-20 23:20:02 +02:00
xGamingDudex d42a5f1897 Prevent Chicken Rocket from resetting cooldown when hitting team mates 2016-10-20 23:13:32 +02:00
xGamingDudex 08b7b7cb48 Removed unused files. Move wool bomb patch to correct file 2016-10-20 23:11:55 +02:00
xGamingDudex 7ad0b214a5 Change team display text 2016-10-20 23:08:40 +02:00
xGamingDudex be2bc09896 Added comma to laser text 2016-10-20 22:56:12 +02:00
xGamingDudex 875bdc1fca Removed unused code 2016-10-20 22:50:12 +02:00
xGamingDudex d119a94d53 Fixed concurrency issue 2016-10-20 22:44:43 +02:00
xGamingDudex 4e4fd2a8e9 Changed respawn title text 2016-10-20 22:44:13 +02:00
xGamingDudex 0705e38b3e Fixed NPE 2016-10-20 22:43:51 +02:00
samczsun bafad1189b ProgressingKitManager: Temporarily add finally 2016-10-19 22:38:39 -04:00
samczsun 09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
samczsun b3ed9db2c7 Fix memory leak in ProgressingKitManager 2016-10-19 22:38:39 -04:00
samczsun 894e6b4a89 Fix memory leak in CombatLogNPC 2016-10-19 22:38:39 -04:00
Alexander Meech 60fad6316b Ensure command used is actually /pumpkin 2016-10-19 20:59:12 -04:00
AlexTheCoder 26baf6aa67 Make Halloween pumpkins actually drop gems and shards in Block Hunt and Minestrike 2016-10-19 20:59:12 -04:00
xGamingDudex db9f358718 Increase Angry Heard durration 2016-10-20 02:01:40 +02:00
xGamingDudex 59712b4089 Prevent multiple abilities from dealing damage and knockback on teammate 2016-10-20 02:01:23 +02:00
xGamingDudex 21d004b3f2 Make the skelleton kit deal static 6 damage for arrows 2016-10-20 02:00:30 +02:00
xGamingDudex 6851a20e92 Fix /lives debug command 2016-10-20 02:00:01 +02:00
xGamingDudex 0d688534b1 Reduce slime smash durration 2016-10-20 01:28:25 +02:00
xGamingDudex 33a7deed58 Tweaked witch daze potion damage 2016-10-20 01:27:43 +02:00
xGamingDudex 74d6c599b5 Fixed snowman turret targeting team mates 2016-10-20 01:27:22 +02:00
xGamingDudex 82f1ec1ac6 Tweaked spider smash 2016-10-20 01:01:46 +02:00
xGamingDudex 2306dbc909 Fixed creeper XP 2016-10-20 01:01:31 +02:00
xGamingDudex 8de69d2573 Fixed guardian passive to acctually work 2016-10-19 17:49:59 +02:00
xGamingDudex 0b02bc9e2d Fixed with daze potion self damage and only randomly working 2016-10-19 16:35:49 +02:00
xGamingDudex 9e3cf58ff5 Type in blaze smash 2016-10-18 19:39:06 +02:00
xGamingDudex 35c9d2ecb1 Tweaked damage/KB values and fixed text issues 2016-10-15 14:56:38 +02:00
cnr 0e5d8cc785 Replace pumpling spawn flicker with short glow 2016-10-14 00:25:55 -05:00
Sam 76a413548b More unused imports 2016-10-13 23:31:32 +01:00
Sam 4810960d82 Stop visible armorstands 2016-10-13 23:19:11 +01:00
Sam 99c72a3b31 Fix debug command 2016-10-13 23:10:59 +01:00
Sam e698037a73 Remove unused import 2016-10-13 22:44:48 +01:00
Sam c93e6be98b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-13 22:43:08 +01:00
Sam ca0da15b8c Fix magma cube 2016-10-13 22:43:04 +01:00
Sam f72f6e8aaa Tweaks 2016-10-13 20:20:00 +01:00
Sam a5d52d9e2f MERGE PLEASE! 2016-10-13 16:11:01 +01:00
Shaun Bennett bb32a06caf Add Halloween Words 2016-10-12 23:30:52 -04:00
AlexTheCoder 7ec530a8c7 Fix lobby protection on build server, make map locks persistent, implement larger parsing size, make map lock command require op, prevent raining on build server, and make block hunt actually work with any map with required information regardless of order 2016-10-12 23:01:25 -04:00
xADudex 311751cc39 Pumpkin's Revenge (#237)
* Initial Commit

* Update

* Bunch of new stuff

* Fixed fletcher arrow typo

* Added reward pet, fixed typo, tweaked lose cinematic

* Lots of tweaks and fixes with QA

* Cleaning up a little code

* Removed debug message on prince death

* Added nighttime to halloween game lobby maps

* Tweaked spawn rates and mob caps

* Typo

* Tweaked texts, cleaned import and cleared all mobs from boss cinematic

* Fixed creepers not getting properly removed during boss cinematic

* Reward typo

* Fixed rare NPE

* Typos

* Tweaked mini zombie

* Typo

* Prevent zombie from spawning minis after being removed

* Tweaked wave announcements + formated WaveVictory

* Changed color of prince tag + formated ZombieSpawner

* Fixed (another) rare NPE

* Tweaked boss wave cinematic
2016-10-12 22:40:05 -04:00
Sam 2b124cb16c I have really lost track on what I'm doing... 2016-10-09 12:24:49 +01:00
Sam 28a2a8c098 More from GI testing 2016-10-08 11:14:55 +01:00
Sam e5e953a8ab Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-06 15:03:53 +01:00
Sam bb9ca490b1 GI changes 2016-10-06 15:03:51 +01:00
Shaun Bennett a6727bf104 Halloween Fixes/Prep 2016-10-05 22:57:44 -04:00
LCastr0 8da5813f29 Add Halloween Cosmetics (#227)
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color

External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat

* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods

External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed

* Internal:
Renamed RewardType enums to have upper case

External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet

* Slack integration to test stuff (Will not be in the code in the last commit)

* Fixed Grim Reaper Hoe not being removed after the morph is disabled

* Details for the Haunted Chest

* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph

* Fixes for lores and names
Support server stuff

* Fixes for the Lock and Unlock cosmetics commands

* Fixes for the Grim Reaper Morph

* Fixes for the Grim Reaper Morph
Removed debug messages

* Fixed a memory leak. Thanks to Sam

* Fix imports

* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()

* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
2016-10-05 10:27:45 -04:00
Keir Nellyer 46db80a056 Always check game object is not null before attempting to access it (#225) 2016-10-04 15:32:04 -04:00
Sam 53c6c07208 Lazer to Laser 2016-10-03 23:17:14 +01:00
Sam e48dfbefe4 Even more fixes! 2016-10-03 21:20:15 +01:00
Sam 4e9cf4dbb4 More fixes 2016-10-03 19:45:15 +01:00
Sam 668abad83a Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-01 15:49:10 +01:00
Sam 4bfc632fd5 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-10-01 15:45:05 +01:00
Sam 36c26c0b2c Fix MineStrike Issues (#222)
* Check if the costume is null before doing anything.

* Disable entity specing
2016-09-29 23:37:41 -04:00
Sam Sun 81070eac62 Plug up memory leaks in IdleManager (#224)
Somehow, IdleManager was keeping Player references loaded
despite having removed them on PlayerQuitEvent.

This may be because of the runnable scheduled for 5 ticks after a teleport
which would insert players after they quit.

In any case, this was keeping entire worlds loaded in UHC. Pretty bad.

Moral of the story? Use UUIDs!
2016-09-29 23:29:53 -04:00
Timothy Andis 7d4c817856 Game Lobby/Playwire/Command Fixes (#223)
* Tweak team locations to accommodate MPS'
Disable certain commands from being used.

* Change PlayWire things.

* Update MPS locations.

* Update.

* Remove debug

* Remove debug. Ty Sam
2016-09-29 23:00:26 -04:00
Sam 22f8a1496a Guardian fixes 2016-09-29 22:44:03 +01:00
Shaun Bennett 9d6985ddcd Fix MPS zip file name, null amp stand 2016-09-29 09:10:25 -04:00
Shaun Bennett b3d8c72953 Add Game Lobby world settings (#220) 2016-09-29 00:22:42 -04:00
Shaun Bennett 7ff6e33941 LegacyGameLobbyManager bug fixes 2016-09-28 23:05:02 -04:00
Timothy Andis 620e219b14 Change MPS world zip (#219)
* Change MPS map name
2016-09-28 21:32:51 -04:00
Shaun Bennett 3ede0e5644 Merge Report System v2 (#216)
Report system (v2)
2016-09-28 17:39:26 -04:00
Timothy Andis 3d7647b26b Game Lobby Update (#215)
* Game Lobby update. Phase 1.

* Correctly apply kit data to players who use the next best game feature.

* I can do integer comparisons, I promise.

* So much stuff, all minor.

* Suck it Carl.

* Fix Party bug.
Update LobbyManager

* Allow QA to test KitProgression @shaun cherry pick this plz.

* Proper generation check (testing)
Remove debugging from NextBestGame

* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.

* ClansHub and Tweaks to the lobby manager

* WA Tweak.
2016-09-28 10:17:05 -04:00
Sam c4e36b2269 Moppletop's September Bug Sprint (#214)
* Earth Cost issue

* Instances of "Tip" to "Thank"

* PC-930

Fix an infinite loop when the game ends.

* PC-959

Fixes an issue where people could spam drop grenades.

* PC-668

Cosmetic Set bonuses no longer carry into MS games

* Changes metal's passive

Metal's passive is now that it gains 0.5 hearts per armor piece. This
avoids the problem of being unkillable
2016-09-27 21:11:49 -04:00
Sam 78e6f3bf71 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-27 19:02:56 +01:00
Sam 68c62acb00 Guardian changes 2016-09-27 19:02:54 +01:00
Keir Nellyer f63561b05e Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-26 10:19:13 +01:00