cnr
181f360f11
Merge branch 'update/cosmetics-valentines' into develop
2017-02-08 22:32:35 -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
LCastr0
06cc8a06c1
Added lore for cupid pet
2017-02-08 21:56:49 -02:00
LCastr0
452a128b2b
Added win room to love chest
2017-02-08 21:54:41 -02:00
LCastr0
22f6f243aa
Fixed hover effect
...
Fixed love chest lore being purple
2017-02-08 15:44:05 -02:00
LCastr0
5902e82d58
Added message if blow a kiss doesn't hit anyone
...
Changed the lore for the taunt
Changed the display item and lore for the love chest
2017-02-08 15:17:04 -02:00
LCastr0
5dcf028a37
Fixed win room being unlocked by default
2017-02-06 23:52:15 -02:00
Sam
e76ce9dce2
Add a treat for samczsun
2017-02-07 00:17:26 +00:00
Sam
44d4fb9d60
Fix /ignore not working
2017-02-07 00:12:59 +00:00
Sam
7452712107
Fix Constants
2017-02-07 00:12:51 +00:00
Sam
bc510e5ad5
QA fixes
2017-02-05 22:24:10 +00:00
samczsun
1c96196359
Various changes for network security
2017-02-04 23:14:52 -05:00
samczsun
f4a9253505
Remove pending bans on instant ban
2017-02-04 20:42:49 -05:00
LCastr0
511bfdecd7
Added lores and icons
2017-02-03 18:45:00 -02:00
Sam
6cc5a14073
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-03 20:33:54 +00:00
LCastr0
adb3386899
Added tracker for love chest
2017-02-03 18:32:29 -02:00
LCastr0
9669f626a1
Fixed issue with chest pages not turning to page 2
2017-02-03 18:31:32 -02:00
LCastr0
9024bb6569
Added custom floor for Love chest
2017-02-02 12:28:10 -02:00
Sam
0d9deb019b
I do so much I never know what I commit
2017-02-02 13:19:23 +00:00
samczsun
8a3b531a06
Bawk Bawk Battles rewrite
2017-02-02 00:31:58 -06:00
AlexTheCoder
16c155ffe8
Reorganize player data representation for better combating chargebacks
2017-02-02 00:23:05 -06:00
Alexander Meech
f53405970c
Fix spacing in pom.xml
2017-02-02 00:16:03 -06:00
AlexTheCoder
552241b070
Implement a Clans Compensation for players impacted by the Clans-103 deletion
2017-02-02 00:16:03 -06:00
AlexTheCoder
dd37b6e89c
Build ClansCompensation with the other plugins
2017-02-02 00:16:03 -06:00
md_5
7dc4c6b5b9
Compile fixes for OpenJDK-9
...
* Upgrade maven-jar-plugin to be compatible
* Remove unused / incompatible imports from PlayerInputActionMenu
2017-02-02 00:14:02 -06:00
LCastr0
d06c445e9c
Reduced amount of particles from love train mount
2017-02-01 11:38:13 -02:00
LCastr0
ea8a4d2786
Reduced amount of particles from love doctor morph
2017-02-01 11:37:11 -02:00
LCastr0
048272ef59
Removed heart particles from love wings
2017-02-01 11:36:12 -02:00
LCastr0
4a42ed42bd
Reduced amount of particles in love chest spawning
2017-02-01 11:35:31 -02:00
LCastr0
c0065ae696
Blow a kiss blowing kiss to yourself
2017-02-01 11:33:17 -02:00
LCastr0
c442c820f5
Disabled purchasing love chest with all the items unlocked
2017-02-01 11:29:50 -02:00
LCastr0
b5130181a2
Merging errors
2017-02-01 11:25:47 -02:00
Sam
c6bb850bc3
Lots of stuff
2017-01-30 23:28:55 +00:00
Sam
fb35f19c3d
Add Villager Properties support
2017-01-30 19:09:07 +00:00
LCastr0
0ce741a5fb
Small wings for cupid pet
2017-01-28 21:38:14 -02:00
LCastr0
2cfd51e38e
Heart shaped wings
2017-01-27 17:40:35 -02:00
LCastr0
e2de60971e
Fixed uneven butterfly wing
2017-01-27 10:29:18 -02:00
Sam
7200572583
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-26 20:10:48 +00:00
LCastr0
dd9f6e938d
Added small butterfly wings
2017-01-26 09:56:21 -02:00
Alexander Meech
741d0914ba
Change premium rank hover descriptions
2017-01-25 21:12:30 -06:00
cnr
b2d17f2680
Merge branch 'update/true-love-pet' into develop
2017-01-25 21:11:56 -06:00
cnr
70948b6967
Refactor PowerPlayClubItem instead of using an event
2017-01-25 21:10:32 -06:00
cnr
20efc234fa
Allow YT to use /disguise
2017-01-25 20:33:25 -06:00
Sam
692fcbacbb
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-24 17:18:29 +00:00
Sam
2c8b8d4fb0
Add max chests
2017-01-23 19:56:00 +00:00
LCastr0
340f629f09
Changed knockback in winroom
2017-01-21 20:13:19 -02:00
LCastr0
9876c0c61c
Changed particles for wings
2017-01-21 19:58:59 -02:00
Sam
8102ba2e4b
Lots of stuff
2017-01-21 20:45:22 +00:00
Sam
c7c7b4448f
Use File.separator
2017-01-21 14:46:18 +00:00
Sam
0827ea2da0
World Listeners
2017-01-21 14:46:05 +00:00
Sam
24d71e09fe
Teleport dead people
2017-01-21 14:45:58 +00:00
Sam
4c38a5878f
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-21 14:28:57 +00:00
Sam
490d1d86f2
Give players their earnt gems
2017-01-21 14:24:04 +00:00
Sam
3557fd8acc
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-21 14:21:03 +00:00
Sam
f5e86f4bc1
Update Villager trading and Events
2017-01-21 14:21:00 +00:00
LCastr0
023ed5ed4a
Small fixes for win room
2017-01-20 22:12:01 -02:00
cnr
8ae74ce952
Increase 2FA window size
2017-01-20 15:42:21 -06:00
cnr
fbb1836eb5
Change Brawl fountain goal to 35M gems
2017-01-20 14:30:54 -06:00
Sam
a16acedb14
Google Sheets v2 finally
2017-01-20 20:08:24 +00:00
cnr
4bb51a3734
Fix non-[\x00-\x7F] characters breaking chat
2017-01-20 01:27:59 -06:00
samczsun
7c829f8712
Filter duplicates, handle permissions in multicommand, support more commands
2017-01-20 01:27:59 -06: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
c340e48daa
Fix Amplifier NPCs disappearing
...
Melon Launchers could be used to shove armor stands around. This has been
disabled
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
cnr
8fdbe87d1d
Allow spaces when checking 2FA codes
2017-01-20 01:27:58 -06:00
cnr
fded8a6583
Change 2FA issuer on the test network
2017-01-20 01:27:58 -06:00
cnr
f23f04fdb1
Fix NPE in getOrLoadClient
2017-01-20 01:14:03 -06:00
cnr
8f72f9d087
Only require 2FA for MAPDEV+
2017-01-20 01:14:03 -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
66af3cc450
Fix parties mute bypass
2017-01-19 23:12:23 -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
LCastr0
34bf89187d
Added win room to gadget manager
2017-01-19 21:44:57 -02:00
LCastr0
d2c7e48903
Started on the battlefield win room
2017-01-19 21:17:17 -02:00
samczsun
343167245e
Fix party chat
2017-01-19 18:16:43 -05:00
LCastr0
a6ab41fe3f
Fixed cupid pet
2017-01-19 21:14:15 -02:00
Sam
8a9a3cb2ac
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-19 21:16:12 +00:00
Sam
36c0c56f27
World Events and Sheets rewrite
2017-01-19 21:15:06 +00:00
LCastr0
2fd0e72439
Changed type of love wings
2017-01-19 04:56:11 -02:00
LCastr0
da36276bc3
Changed permissions for unlockcosmetics command
2017-01-19 00:50:42 -06:00
LCastr0
6180162476
Now only remove on teleport if its void
2017-01-19 00:50:42 -06:00
LCastr0
704c787008
Fixed lava and void issues again, prevents CME
2017-01-19 00:50:42 -06:00
LCastr0
d7fe81184a
Better message when despawning balloons
2017-01-19 00:50:42 -06:00
LCastr0
0d1f3a0613
Fixed balloons dying on void
...
Fixed balloons bug near lava
Fixed balloons lore in menu
2017-01-19 00:50:42 -06:00
LCastr0
7f22872dd6
Changed OpenBalloons so it actually opens the balloons menu
2017-01-19 00:50:42 -06:00
LCastr0
a1a0271cd9
Added balloons to gadgets
2017-01-19 00:50:42 -06:00
LCastr0
9cba2aa9fc
Removed disabled balloons from chests
2017-01-19 00:50:42 -06:00
LCastr0
03aa049f40
Added balloons to chests
2017-01-19 00:50:42 -06:00
cnr
e3b56eda2a
Add 2FA reset command
2017-01-19 00:15:17 -06:00
cnr
9831c7259a
Enforce 2FA and re-enable unbans for trainee+
2017-01-18 23:47:47 -06: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
c5d5d86c1d
Use CoreClient instead of Player in case the player quits
2017-01-18 23:20:24 -06:00
samczsun
ac63985419
Revert removing strict anticheat
2017-01-18 23:20:24 -06:00
samczsun
cdc4f3debd
Don't try to reload client if already loaded
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
d856736bf4
PC-1301
...
If a player joins before any of our listeners are registered, they'll have
an account id of -1. If they manage to also not have a redis entry, their
cached id will also be -1. This breaks stuff. Instead, let's just kick
them.
Note that I'm not sending them using Portal because Portal is slow and I
want them off the server immediately
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
LCastr0
912bad5035
Used wrong method name
2017-01-18 21:20:32 -02:00
LCastr0
1557f3a39c
Added love chest to customer support server
2017-01-18 21:02:57 -02:00
LCastr0
ed8363e1be
Added items to infused chests
2017-01-18 20:57:54 -02:00
LCastr0
4cdb652b79
Removed winter items from infused chests
2017-01-18 20:35:17 -02:00
LCastr0
ad9caa68a0
Small change to treasure page
2017-01-18 20:34:16 -02:00
LCastr0
f93794f14d
Removed permissions for snr mods to use unlock cosmetics
2017-01-18 20:31:35 -02:00
LCastr0
6ba1901490
Revert "Revered changes to chest page"
...
This reverts commit 419c4b1053
2017-01-18 01:07:50 -02:00
LCastr0
419c4b1053
Revered changes to chest page
2017-01-18 00:52:36 -02:00
LCastr0
3e16c7fdf0
Added items to love chest (missing win room)
2017-01-17 23:34:16 -02:00
LCastr0
d49e85c21a
Corrected chances for love chest
2017-01-17 23:30:29 -02:00
LCastr0
447a1cee18
Removed unused code
2017-01-17 23:28:19 -02:00
LCastr0
09c43ce73b
Added love chets to titles tracking
2017-01-17 23:26:09 -02:00
LCastr0
65cc1b598d
Change Flame Rings icon
...
Fixed issue with buy chest button
2017-01-17 21:08:38 -02:00
LCastr0
75ede7f823
Fixed present danger display item
2017-01-17 20:21:37 -02:00
LCastr0
27aa682727
Stops players from purchasing the chest
2017-01-17 20:20:17 -02:00
LCastr0
76b356f73c
Removed gingerbread chest
2017-01-17 19:24:27 -02:00
Sam
1a580251e9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-17 09:51:17 +00:00
LCastr0
cdd1e63989
Ops, are we back in time? Fixed lore saying 2012 instead of 2017
2017-01-17 06:30:47 -02:00
LCastr0
ccd490b41a
Added love chest
2017-01-16 21:06:24 -02:00
LCastr0
819741d8ff
Removed gadget selection since it will only work during games
2017-01-16 19:55:28 -02:00
LCastr0
a70c8eccc6
Blow a kiss taunt
2017-01-16 19:43:49 -02:00
LCastr0
ddc098649f
Cupid Pet
2017-01-16 19:28:06 -02:00
LCastr0
694b2f69b2
Love train mount
2017-01-16 19:02:22 -02:00
LCastr0
ebfd6e5cc5
Use correct way for adding pets to ppc
2017-01-16 04:19:57 -02:00
LCastr0
c571736def
Silent villager
2017-01-16 01:57:42 -02:00
LCastr0
9e4f756fe8
Even better way of making pet circle around you
2017-01-15 02:46:44 -02:00
LCastr0
7600cd6e04
Added enderman gun
2017-01-15 00:07:48 -02:00
LCastr0
46552428a4
Make them slower
2017-01-14 23:55:24 -02:00
LCastr0
6e399b10db
Increased radius
2017-01-14 23:27:02 -02:00
LCastr0
3d49eb2181
Better way to handle the circle points
2017-01-14 23:21:49 -02:00
LCastr0
2398fbc8c9
Added correct ppc lore
2017-01-14 23:15:41 -02:00
LCastr0
6c75f6e7dc
Showing correct icon for pets
2017-01-14 23:12:31 -02:00
LCastr0
fb05a08e91
Merge branch 'develop' into update/true-love-pet
2017-01-14 23:10:20 -02:00
LCastr0
28442abbbd
Now using the correct naming...
2017-01-14 23:09:46 -02:00
LCastr0
e03b59bb7c
Added love wings to gadget manager
2017-01-14 22:22:17 -02:00
LCastr0
03c2ec56b7
Added love wings
2017-01-14 22:21:38 -02:00
LCastr0
33cb3b74fc
Added love doctor morph to gadgetmanager
2017-01-14 22:11:25 -02:00
LCastr0
fa9f895891
Use the correct event
2017-01-14 21:01:18 -02:00
LCastr0
d667524ed9
Love Doctor Morph
2017-01-14 20:50:44 -02:00
LCastr0
2976eab5bf
Added particles
2017-01-14 20:06:12 -02:00
LCastr0
8c11f2c4cb
Added True Love Pet
2017-01-14 18:57:40 -02:00
cnr
ef53ae5737
Reinstate missing _showInterface check
2017-01-14 13:59:06 -06:00
cnr
5ba3fac58c
Check twofactor status instead of interact events
2017-01-14 01:29:37 -06:00
LCastr0
babc72a87c
Fixed lore
2017-01-13 23:31:22 -06:00
samczsun
1a5a530133
Fix Evolution crash
2017-01-13 23:30:13 -06:00
cnr
66bff40040
Update StaffServer whitelist
2017-01-13 21:52:02 -06:00
cnr
bb2477676c
Add missing diff from PP-Bizon fix
2017-01-13 14:24:48 -06:00
Sam
b55902f853
World events
2017-01-13 17:16:36 +00:00
cnr
d5160bf10b
Don't register https scheme in BungeeRotator
2017-01-13 03:07:50 -06:00
cnr
89ccaf4323
Disable hotbar items when authenticating with 2FA
2017-01-13 01:14:31 -06:00
samczsun
a4614fe3b4
Drastically reduce BungeeRotator size (3MB!!!)
2017-01-12 23:23:11 -06:00
samczsun
251eb2e53e
Let's be legal
2017-01-12 23:22:40 -06:00
samczsun
e82d1b5885
Remove spigot as a dependency from ServerData
2017-01-12 23:22:39 -06:00
cnr
cdfc19f566
Ignore canceled player interact events
2017-01-12 23:05:34 -06:00
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
cnr
3af401ee8f
Implement two-factor authentication
2017-01-04 20:33:09 -07:00
Sam
571840e249
Lots more changes
2017-01-02 14:40:13 +00:00
LCastr0
17bdfe6814
Started on the flying mechanics stuff
2016-12-30 12:44:49 -02:00
LCastr0
1aca03b22d
Added balloons to normal chests
2016-12-30 12:17:52 -02:00
LCastr0
ef7bbfe7eb
Added Balloons to omega chest
2016-12-30 12:10:26 -02:00
LCastr0
9578864f8a
Added display item
2016-12-29 21:49:20 -02:00
LCastr0
9ec8835374
Fixed block balloons!
2016-12-29 21:40:02 -02:00
LCastr0
16e40c2896
Added shotgun skin
2016-12-29 19:18:09 -02:00
LCastr0
fcec0399cd
Added remaining skins to chest
2016-12-29 19:08:31 -02:00
LCastr0
5f0de2e5e3
Allows 2 chests to be opened and dupes for minestrike chest
2016-12-29 18:04:24 -02:00
LCastr0
c877f20031
Added other skins, forgot this on the last commit
2016-12-29 18:00:18 -02:00
LCastr0
025a43b519
Added ms skins to their own chest, and added chest to page
2016-12-29 17:58:48 -02:00
LCastr0
36303a0fe8
Added new minestrike skins (some, at least?)
2016-12-29 17:43:50 -02:00
LCastr0
8131656ae2
Changed RankReward to have Eternal rank
2016-12-29 17:06:07 -02: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
efea2b0c1d
Merge branch 'feature/dinnerbone-morph' into develop
2016-12-28 15:19:06 -07:00
cnr
c7d5e149f8
Fix NullPointerException in speed builders
2016-12-28 15:18:59 -07:00
Sam
4f497a2025
Rank rewards
2016-12-28 18:48:19 +00:00
Sam
4c7f5c5716
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-27 18:59:03 +00:00
Sam
e114ab03b5
Chest spawning
2016-12-27 17:20:53 +00:00
Sam
3a6cef32a4
Add Gem Hunters as a catagory for the build server
2016-12-26 22:45:18 -07:00
cnr
d3bcc77e01
Enable double XP + gems for the holidays
2016-12-26 22:43:32 -07:00
cnr
0b4d217303
Reduce number of redis requests by communities
2016-12-26 22:34:09 -07:00
LCastr0
c685486086
Fixed some types of entities
2016-12-27 00:58:16 -02:00
LCastr0
5198d64ab8
Added all the balloons!
2016-12-27 00:29:48 -02:00
LCastr0
092cde9973
Renamed to BalloonData
2016-12-27 00:01:42 -02:00
LCastr0
cd70305afb
Make leashes not break (WITHOUT packets ;))
2016-12-26 23:17:04 -02:00
LCastr0
f25c592a6d
Removed commented code
2016-12-26 22:20:23 -02:00
LCastr0
78510ffbbf
Allows multiple balloons
2016-12-26 22:19:08 -02:00
LCastr0
5e420a20d8
Changed temporary display item so it doesn't bug with 1.11
2016-12-26 20:21:43 -02:00
LCastr0
d19d661c7d
Modified pets so they don't make different sounds anymore :toot:
2016-12-26 19:02:35 -02:00
