LCastr0
0befc7d967
Fixed issue with gadget command re-enabling after running
2017-02-16 02:04:02 -06:00
samczsun
81f38cf06b
Give trainees find
2017-02-16 02:03:25 -06:00
samczsun
7e18989fb7
PC-267 PC-545 PC-1253
...
This is to fix a troublesome race condition occurring between Mineplexer
and Core. Simply put, the following steps occur normally:
1) Player logs in via Bungee
2) If there is no PlayerInfo entry, PlayerStats inserts a PlayerInfo entry
into Redis
3) CoreClientManager looks for the PlayerInfo entry and finds it
4) If the PlayerInfo entry was just inserted, it will have accountId=0.
CoreClientManager sees this and updates it to a valid accountId, then
reinserts into Redis
5) All is good
However, sometimes Step 3 occurs before Step 2 (perhaps latency to Redis
is a factor), and so CoreClientManager
sees a null entry and ignores it. Then, an invalid PlayerInfo entry is
inserted with accountId=0, which then breaks any SQL queries relying on an
valid accountId
2017-02-16 02:03:25 -06:00
samczsun
cd387284bf
Ignore armorstands for fleshhook/snowball
2017-02-16 02:03:25 -06:00
Sam
a879a1dc80
Item Map added
2017-02-13 18:18:32 +00:00
Sam
3a4e973551
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-12 13:12:53 +00:00
Sam
16773521b9
Lots of fixes
2017-02-11 17:18:39 +00:00
AlexTheCoder
11791bc461
Block joining clans servers via friends, block joining of clans servers that are restarting, clean up log mob armor stands on restart, take staff out of observer mode on restart
2017-02-09 22:44:30 -06:00
samczsun
5e5b607fc8
Fix my goof
2017-02-09 22:44:00 -06:00
cnr
181f360f11
Merge branch 'update/cosmetics-valentines' into develop
2017-02-08 22:32:35 -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
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
samczsun
8a3b531a06
Bawk Bawk Battles rewrite
2017-02-02 00:31:58 -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
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
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
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
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
4c38a5878f
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-21 14:28:57 +00:00
Sam
3557fd8acc
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-21 14:21:03 +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
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
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
66af3cc450
Fix parties mute bypass
2017-01-19 23:12:23 -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
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
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
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
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
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
bb2477676c
Add missing diff from PP-Bizon fix
2017-01-13 14:24:48 -06:00
cnr
89ccaf4323
Disable hotbar items when authenticating with 2FA
2017-01-13 01:14:31 -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
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
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
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
samczsun
132036bd17
Move Constants to common
2017-01-11 20:42:46 -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
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
cnr
cea08cae67
Merge branch 'update/cosmetics-balloons' into develop
2017-01-11 15:32:41 -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
cb13fb1ccc
1.8 titles!
2017-01-11 15:11:57 -06:00
samczsun
bcea0044e8
Animated Titles!
2017-01-11 15:11:57 -06:00