Commit Graph

4292 Commits

Author SHA1 Message Date
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
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