Commit Graph

10160 Commits

Author SHA1 Message Date
LCastr0
2bb8023b47 Changed chest spawn animation 2017-01-12 18:20:19 -06:00
LCastr0
4a803c1482 Fixed NPE, weapon name is now back at the lore 2017-01-12 18:20:14 -06:00
cnr
8d33a49397 Use a more explicit title for classic MineStrike 2017-01-12 15:59:57 -06:00
LCastr0
85eb38032f Added minestrike chest to treasure hunt track 2017-01-12 18:50:55 -02:00
LCastr0
9385144566 Lowered the cost from 20000 to 10000 2017-01-12 16:52:36 -02:00
LCastr0
353cefe949 Added weapon name after skin name
Changed lore and icon of MS chest
2017-01-12 16:36:29 -02:00
Sam
d5be0f5061 Remove args to match new parameters 2017-01-12 18:04:59 +00:00
Sam
3d64319180 Missing commands 2017-01-12 18:03:40 +00:00
Sam
8d47e80066 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-12 18:03:07 +00:00
LCastr0
4b3b7849eb Added MS chest to customer support server 2017-01-12 15:55:15 -02:00
cnr
ac32fbb15e Add StrikeGames to MineStrike NPC's server page 2017-01-12 00:54:59 -06: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
4fd92a3402 Fix remainder of parties bugs 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
91773de97e Don't use metadata for two-factor auth 2017-01-11 16:17:03 -06:00
Kenny
6f2705f0e4 Reduce size of bungeerotator jar
Make use of the maven shade plugin's `minimizeJar` option to filter out
classes not explicitly mentioned, and use two artifact filters to
explicitly include classes used. Also removes the mysql driver check in
the main method as it is not necessary for this program to work.
2017-01-11 15:46:20 -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
Shaun Bennett
28a83ef722 Don't delete old client when being replaced (solves enjin listener issue) 2017-01-11 15:28:59 -06:00
samczsun
cbe238c83d Don't give book on join 2017-01-11 15:11:57 -06:00
samczsun
716c77451e Update the right titles 2017-01-11 15:11:57 -06:00
samczsun
fbaeffc96e Remove EventHandler annotation 2017-01-11 15:11:57 -06:00
samczsun
99211d5d89 Fix particles 2017-01-11 15:11:57 -06:00
samczsun
cb13fb1ccc 1.8 titles! 2017-01-11 15:11:57 -06:00
samczsun
bcea0044e8 Animated Titles! 2017-01-11 15:11:57 -06:00
Nate Mortensen
e803df6884 Fix Blink ability with Spectators
When using blink, players are teleported away from other players
within a one block radius of them.  However, if a player happens
to have the exact same position(only can occur when a player is
spectating them), division by 0 occurs, resulting in the player
being teleported to NaN, as any operation with NaN is also NaN.

To fix this, Blink now ignores players in Spectator mode.  This
change could also address the hypothetical scenario where a
spectator is within the one block radius and results in a blinking
player getting teleported in a weird direction.
2017-01-11 15:07:48 -06:00
Nate Mortensen
9583c7abcb Run Minestrike in Adventure Mode 2017-01-11 15:07:48 -06:00
Nate Mortensen
0bb01d39b6 Fix PP-Bizon skin 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
e1aeaa8714 Add damage metadata system to CombatLog and CustomDamageEvent
This adds a system whereby plugins can associate metadata with individual
damage events and then retrieve that metadata later from the CombatLog.
One example use case for this is Minestrike.  Players are rewarded according
to the weapon that they used to kill another player, however the weapons
are frequently renamed.  Minestrike can now associate a "gunType" key
to the name of the weapon used to kill the player, regardless of the skin
that the gun currently has applied to it.
2017-01-11 15:07:47 -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
0a655932af IntelliJ removed an import after I commited last time 2017-01-11 15:50:53 -02:00
LCastr0
5e85f48c87 Fixed balloons still being added to chests 2017-01-11 01:54:53 -02:00
LCastr0
21473a7d82 Fixed merge conflict 2017-01-10 21:27:47 -02:00
LCastr0
d3e6a094e5 Removed balloons for now, will be in the next update
Updated cosmetics menu
Added weapon name to skin lore
2017-01-10 21:08:03 -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
cbc5ed491c Check two-factor status for every player on login 2017-01-05 19:16:28 -07:00
cnr
96c15376aa Use default 2FA window size (3) 2017-01-05 15:20:10 -07:00
cnr
435abbba08 Allow builders to use 2FA 2017-01-05 10:48:56 -07:00
cnr
a2472f45b4 Cancel commands when authenticating with 2FA 2017-01-05 10:44:03 -07:00
cnr
fa6a60981c Return to normal hub type 2017-01-04 20:36:16 -07:00
cnr
f08068c717 Revert "Enable double XP + gems for the holidays"
This reverts commit d3bcc77e01.
2017-01-04 20:34:09 -07:00