a97ba5d1fd
PC-941
2017-04-06 00:34:34 -05:00
4f77413523
PC-265
2017-04-06 00:34:34 -05:00
888c26c12d
Changed icon of bunny pet
2017-04-05 19:03:12 -03:00
e4b79a3731
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/skyfall
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/Island.java
2017-04-05 04:21:14 +02:00
27d7226712
Fixed flowers dropping after chest is opened
2017-04-04 22:58:43 -03:00
cb5b0a3c83
Changed the icon of the death effect
2017-04-04 18:00:47 -03:00
2c09bb584a
Fixed Spring Set lore
2017-04-04 17:33:02 -03:00
424e0fe0a4
Fixed spring chests being purchasable even if locked or if player had all the items
2017-04-04 17:29:45 -03:00
957004f97a
Added 'Found in X' lore
2017-04-04 17:28:11 -03:00
83d141eddc
Changed price of Spring Halo particle
2017-04-04 17:25:16 -03:00
a7be020c9d
Locked rabbit as adult
2017-04-04 17:23:43 -03:00
3bc4125b76
Removed custom pet from this update
2017-04-04 15:47:02 -03:00
b86ad77e0b
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-04-02 12:53:40 +01:00
bc1050e387
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-04-02 12:48:35 +01:00
6534561893
Disable April Fools manager
2017-04-01 23:59:47 -05:00
ef21106da0
Fix memory leak in CompassModule
2017-04-01 16:20:59 -05:00
e71bab8cea
Use a better DB schema
2017-04-01 02:11:11 -05:00
da29654807
April Fools Treasure Hunt
2017-04-01 02:11:11 -05:00
bd841762d1
Run skin getting on the main thread
2017-04-01 02:11:11 -05:00
016860b615
Replace NPCs with Pirates
2017-04-01 02:11:11 -05:00
4053e43964
Add a manual toggle
2017-04-01 02:11:11 -05:00
4b22355348
Add more fun stuff
2017-04-01 02:11:11 -05:00
52323f6119
Add more replacement words
2017-04-01 02:11:11 -05:00
e74486c1bc
Add even more priate speak
2017-04-01 02:11:11 -05:00
4c882ae4a8
Fix chat handling elsewhere
2017-04-01 02:11:11 -05:00
66cea341a5
Use regex and remove "g"
2017-04-01 02:11:11 -05:00
03d781ca70
It be April fools matey, walk yee plank
2017-04-01 02:11:11 -05:00
850b7b1aad
Merge remote-tracking branch 'update/aprilppc' into develop
2017-03-31 00:50:55 -05:00
10a1f71558
Add RustyDawgT to featured creators
2017-03-31 00:50:14 -05:00
ed39d5daa7
Reverted rename
2017-03-31 01:16:30 -03:00
911d5d20d2
Reverted rename
2017-03-31 01:07:00 -03:00
e8d6c321cd
Merge branch 'develop' into update/aprilppc
2017-03-31 00:40:38 -03:00
4d32efe779
Not even disguises are safe from the NSA
2017-03-29 23:31:12 -05:00
c8eab2596f
Move package because intellij is complaining
2017-03-29 23:31:12 -05:00
affb2cb91f
PC-1395
...
Don't disable self otherwise a message is shown
2017-03-29 23:30:49 -05:00
017d737e59
PC-1248 PC-1249
2017-03-29 23:30:49 -05:00
52f09655e8
PC-1231
2017-03-29 23:30:49 -05:00
63eed1abcd
PC-1210
2017-03-29 23:30:49 -05:00
cb33bc7bed
PC-1187
2017-03-29 23:30:49 -05:00
fc686ea497
PC-1182
2017-03-29 23:30:49 -05:00
40648cf715
PC-1178
2017-03-29 23:30:49 -05:00
23c52eed2c
PC-729
2017-03-29 23:30:49 -05:00
3b8bda9dbd
PC-728
2017-03-29 23:30:49 -05:00
99534e19c5
PC-599
2017-03-29 23:30:49 -05:00
9256fe9903
PC-401
2017-03-29 23:30:49 -05:00
26d3a77748
PC-368
2017-03-29 23:30:49 -05:00
4f3cfaba43
PC-163 PC-200
...
Reset a player's spectator target when they switch servers
2017-03-29 23:30:49 -05:00
fec8a42fd7
Merge branch 'update/aprilchest' of https://github.com/Mineplex-LLC/Minecraft-PC into update/aprilchest
2017-03-28 17:29:05 -03:00
88db9c2913
Added Bugs Bunny to spring chest
2017-03-28 17:26:50 -03:00
61147c1e38
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-03-28 20:43:22 +01:00
60a688b5ac
Merge branch 'develop' into update/aprilchest
2017-03-28 11:55:14 -03:00
e3eac8b3ec
Enable 2FA for support
2017-03-27 23:37:45 -05:00
ae2768d354
Changed name, lore, icon and cooldown
2017-03-27 23:58:01 -03:00
8da2431415
Added bugs bunny quotes
2017-03-27 22:39:50 -03:00
cb5a63974e
Changed name of the item in PPC rewards
2017-03-27 20:21:46 -03:00
4f0110b942
Updated offset of the wings
2017-03-27 20:19:54 -03:00
235288af56
Changed wing shape again
2017-03-27 17:35:05 -03:00
3c241c48bc
Changed rabbit morph to spawn holograms
2017-03-27 17:26:18 -03:00
32bb2515f7
Changed height of skeleton
2017-03-26 01:26:43 -03:00
9ee6960038
Added bee wings
2017-03-26 01:25:08 -03:00
3837d9fbda
This should have been added in the last commit...
2017-03-25 18:38:43 -03:00
bff837ca9b
Fixed morph and possible fix for balloons, added lore and icon for particle effect
2017-03-25 18:36:12 -03:00
4455509bc8
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-03-25 14:03:35 +00:00
6875287b6d
Changed pets to Entities instead of Creatures
2017-03-24 16:52:37 -03:00
5464a74d2c
Added spring chest
2017-03-24 14:17:15 -03:00
d2851b0708
Merge branch 'develop' into update/aprilchest
2017-03-24 14:01:15 -03:00
64ed3e2e1b
Still trying with armor stands...
2017-03-24 13:45:36 -03:00
d95ed8d749
Disable /link and /unlink help messages
2017-03-23 23:22:33 -05:00
3b2c50efa3
Remove magic values for PPC tag id and linked tag id
2017-03-23 23:18:29 -05:00
1ff033de43
Refactor website link to use consumers instead of callbacks
2017-03-23 23:18:29 -05:00
f6fdc1f817
Implement a method for administrators to remove the link between an in-game minecraft account and a forum account, and rewrite synchronization of tags to more effectively handle the intricacies of the API being utilized
2017-03-23 23:18:29 -05:00
3ebfb453c5
Implement rank and powerplay linking to the website and give specific ranks an id corresponding to their respective forum tag
2017-03-23 23:18:29 -05:00
9c504064c1
Force all players to reappear after win room
2017-03-22 22:41:08 -05:00
3b48a7caaf
Update armorstand to make it never fall
2017-03-22 16:55:49 -03:00
49bc6b8663
Removed gravity
2017-03-22 14:42:11 -03:00
47b88b7734
Added Spring set, added awkward bunny morph, added items to menus
2017-03-22 14:37:42 -03:00
788326fe54
Tried with armorstands, still not working :(
2017-03-22 13:11:14 -03:00
9afa829f89
Created new gadget item for PPC
2017-03-21 15:56:05 -03:00
4cd25ad921
Merge branch 'update/aprilppc' into update/aprilchest
2017-03-20 19:23:33 -03:00
d55690f904
Changed colors
2017-03-20 19:22:50 -03:00
8f7f52e222
Added lore and icon for Funeral Bouquet and corrected the price for spring items
2017-03-20 16:52:27 -03:00
33b933f465
Added lore and icon for Flower Power
2017-03-20 16:50:44 -03:00
540a0189b4
Added lore and icon for Flower Arrow
2017-03-20 16:49:20 -03:00
16f02d5bd4
Added killer bunny pet
2017-03-20 16:38:31 -03:00
5ad0bdcab1
Added Spring Arrow Trail, added Spring Death Effect, moved each gadget to it's own package, added Spring Double Jump
2017-03-20 16:33:21 -03:00
5d2681ec97
Fixed some issues with menus!
2017-03-20 16:33:20 -03:00
defece04a9
Fixed some issues changing Creature to Entity
2017-03-20 16:33:20 -03:00
df4d0b117b
Possible fix for pet names not showing
2017-03-20 16:33:19 -03:00
f5a85f2a54
Spawns pet
2017-03-20 16:33:18 -03:00
13238eb4ad
Added equipment pages
2017-03-20 16:32:34 -03:00
e297f844e6
Renamed classes
2017-03-20 16:32:34 -03:00
137220d58f
Custom pets
2017-03-20 16:32:33 -03:00
f8f7c04f58
Improve Performance, add dynamic rot rate, change some loot and islands only rot on the top
2017-03-20 19:18:33 +01:00
afad64bec3
Fixed CME
2017-03-20 08:49:20 -03:00
75ad5b9d51
Flowers where player walks
2017-03-20 08:23:32 -03:00
afe516e10c
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters-persistence
2017-03-18 23:33:34 +00:00
f56b940a73
Super rough and ready persistence
2017-03-18 23:33:30 +00:00
e1d9a568c9
Added flower as a hat
2017-03-18 00:49:12 -03:00
d8b68e4716
Multi colored circle
2017-03-17 20:01:48 -03:00
92f5214c91
Added spring halo particle
2017-03-17 19:39:41 -03:00
b464cab213
Add former St Patricks cosmetic names as alternatives
2017-03-17 00:52:41 -05:00
a0764443a8
Merge branch 'update/stpatrickscosmetics' into develop
2017-03-17 00:49:51 -05:00
f6884fccd8
Change update protocol
2017-03-17 00:20:56 -05:00
866b7bf63b
Better help message
2017-03-17 00:20:56 -05:00
a1bad6d07e
QoL improvements
2017-03-17 00:20:55 -05:00
e4cd809ce4
Teamspeak integration
2017-03-17 00:20:55 -05:00
561d4108c2
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-16 22:52:07 -03:00
2070f7b347
Fixed lore for taunts
2017-03-16 20:09:51 -03:00
3303f89c02
Added St Patrick's Chest to titles trackers
2017-03-16 20:07:10 -03:00
e3974b9228
Fixed lores
2017-03-16 19:56:52 -03:00
d64f50b98e
Don't combine require() and a method accessor
2017-03-16 01:13:54 -05:00
78b6846cf6
Add Titles to chests
2017-03-16 00:58:53 -05:00
94009cd652
Final changes
2017-03-15 23:16:09 -05:00
035f4637ba
Tracks in chests!
2017-03-15 23:16:08 -05:00
d1993465a6
Add to online player if they're online
2017-03-15 23:16:08 -05:00
ca5b4386f3
Nevermind, make a new command
2017-03-15 23:16:08 -05:00
1cb118d3e5
Allow force giving items
2017-03-15 23:16:08 -05:00
db2feeac42
Reorganize tracks, add BotB track
2017-03-15 23:16:07 -05:00
e5d2ad34eb
Merge branch 'update/stpatrickscosmetics' into develop
2017-03-15 23:15:10 -05:00
572e461eb2
Remove stray debug text
2017-03-15 23:14:19 -05:00
2dce455f93
Update Carl animation to use shards instead of coins
2017-03-15 23:14:19 -05:00
2881071c74
Patch Carl reward animation not cleaning up and update the votifier server to use uuid as the key for the status repository
2017-03-15 23:14:18 -05:00
a3861d43c4
Fixes costume throwing items without complete set
2017-03-14 13:32:49 -03:00
78a8e53d2e
Re-enable 2FA for Gem Hunters
2017-03-14 00:41:11 -05:00
2b988a02d8
Fixed horse
2017-03-13 19:39:14 -03:00
a231c0b031
Wooo finally!
2017-03-13 22:01:06 +00:00
c54cd066ef
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-12 20:54:48 -03:00
401738f19a
Removed horse cooldown
2017-03-12 20:53:43 -03:00
7ab201f206
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-10 18:10:12 +00:00
7ed485c7ca
Lets turn up the heat on this chess match...
2017-03-09 01:07:30 -06:00
9fdcce525b
Make extreme prejudice a bit more sneaky
2017-03-09 01:07:30 -06:00
b78ce421b5
Notify via redis when an extreme prejudice ban occurs
2017-03-09 01:07:30 -06:00
1148283dff
Implement targeted GWEN-based discrimination against certain ip addresses
2017-03-09 01:07:30 -06:00
a069d7ab59
Remove unnecessary INNER JOIN in sql to load a home server id
2017-03-09 01:04:50 -06:00
721dd5a29a
Update SQL to follow table name standards, color channel names in Carl GUI, and fix item positions in GUI
2017-03-09 01:04:50 -06:00
f2394da7dc
Give RewardManager access to StatsManager
2017-03-09 01:04:50 -06:00
a691d58840
Set up clans specific rewards for voting, daily bonus, and youtube clicks. Additionally, set up promotion for specific youtube channels in Carl. Finally, provide support for a differently-named creeper!
2017-03-09 01:04:50 -06:00
7e70d02751
Properly award all values in BonusAmount wherever it is used for rewarding
2017-03-09 01:04:50 -06:00
a4c875b4bd
Refactor Clans gold to be set from Core
2017-03-09 01:04:50 -06:00
9591485bb6
Re-implement voting with Gem rewards and start refactoring Carl gold rewards
2017-03-09 01:04:50 -06:00
a9b53c8608
Gem Hunters Phase 2
2017-03-08 12:51:16 +00:00
3469b890d4
Rainbow taunt now uses sides of player as locations
2017-03-07 21:51:06 -03:00
1ffac1dd31
Drop nuggets when removing chests
2017-03-06 18:09:42 -03:00
ec5de0ef12
Merging issues
2017-03-06 17:10:29 -03:00
3cc304d99c
Used correct item for the mount
2017-03-04 23:52:12 -03:00
3d76f04508
Fixed rainbow taunt lagging players
2017-03-04 16:08:55 -03:00
f9b66e28f4
Fixed taunts not being disabled correctly
2017-03-04 14:07:24 -03:00
85b5eee92f
Fixed the rainbow taunt
2017-03-04 00:40:53 -03:00
d6605e973d
Changed chest animation
2017-03-03 23:38:32 -03:00
4a496ea4c1
Added particle for when opening the chests
2017-03-03 22:34:21 -03:00
2b18d62f0f
Added icons and lores
...
Added floor for the chest
Fixed little copy paste error in BuyChestButton
Reduced amount of gold in the costume
2017-03-03 21:50:16 -03:00
4211682ca2
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-02 20:30:00 +00:00
28746c7873
St Patricks Chest
2017-03-02 15:50:56 -03:00
cfe2a07278
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-02 16:58:26 +00:00
a0e79d87a2
Allow ops to use minecraft commands
2017-03-01 23:58:20 -06:00
7af7abd615
Sentry Issue #223589200
...
Fix PetManager trying to rename a pet when it doesn't exist
Steps to reproduce:
1) Somehow make MSSQL slow
2) Rename pet, and disable pet
2017-03-01 23:54:02 -06:00
c4bb9a23d5
Sentry Issue #223492448
...
Check if Power Player data is loaded before acting on it
Steps to reproduce:
1) Join before server has started up
2017-03-01 23:54:02 -06:00
ed25fe1341
Sentry Issue #224064210
...
Have BonusManager check if Carl is enabled before cleaning up items
Steps to reproduce:
Trigger SQLException in NPCManager so NPCs aren't loaded,
or temporarily remove Carl from npcs database
2017-03-01 23:54:02 -06:00
4d3301da56
Sentry Issue #223476291
...
Check whether worlds are equal before performing distance checks
Steps to reproduce:
1) Open treasure on one account
2) Go to Mavericks World on another account, tp to coords of treasure
2017-03-01 23:54:02 -06:00
13ffcbbd9b
Rewrite of logout npcs, lots of quests
2017-03-01 18:07:35 +00:00
ff6a3e915e
Add Gold Pot Morph
2017-02-28 23:12:07 -06:00
0ca4b2041d
Fix a CCE in MorphDinnerbone
2017-02-27 19:00:06 +00:00
7d5d5d5401
Re-enable 2fa
2017-02-25 15:47:24 +00:00
699845d6d7
Merge branch 'feature/gem-hunters' into develop
2017-02-25 00:40:05 -06:00
7de556e3d8
Allow plugins to choose a hub type when restarting
...
Clans Hubs will send to Clans Hubs, Clans will send to Clans Hubs, and
all other plugins will send to the normal Hub
2017-02-25 00:35:46 -06:00
9450c29e3e
Allow ETERNAL into the beta
2017-02-25 00:31:12 -06:00
7201e0ec0d
Added taunt to menu
2017-02-24 22:08:36 -03:00
d471ac112e
Fixed rainbow taunt a bit
2017-02-24 22:08:04 -03:00
b2fd8ac748
Rainbow taunt
2017-02-24 22:06:18 -03:00
a32cb6ab2f
Mount
2017-02-24 19:39:54 -03:00
7be7b47395
Debug stuff
2017-02-24 22:11:27 +00:00
68f61bbb20
Send players to beta hubs; add 2fa and anticheat
2017-02-24 06:57:15 -06:00
eed784da04
Add beta whitelist to GemHunters and remove missing debug references
2017-02-24 06:57:00 -06:00
fb70c93f91
Add beta whitelist miniplugin
2017-02-24 00:46:05 -06:00
60d9bd5d21
Move api to config file
2017-02-24 00:46:04 -06:00
9ece8c9959
Add beta whitelist miniplugin
2017-02-23 23:39:34 -06:00
8088cef29f
Leprechaun pet fixed
2017-02-23 20:12:11 -03:00
e731a91e40
Leprechaun pet
2017-02-23 17:35:50 -03:00
63cef754f6
St Patricks outfit
2017-02-23 14:57:52 -03:00
2b64de8ad1
Preparation for beta
2017-02-23 14:42:55 +00:00
5b13a87500
Move api to config file
2017-02-22 23:32:56 -06:00
1b2c384afe
Mounts base
2017-02-21 09:56:08 +00:00
14f33ba494
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-18 10:35:19 +00:00
b80a41ebe7
Reduce refresh rate of communities
...
Communities will only be refreshed if:
- We know (via redis message) that the community has been changed (e.g.,
if a member joins/leaves, if an invite is sent, ...).
- Five minutes have passed since a full refresh
2017-02-18 01:31:53 -06:00
2657a98e70
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-17 18:16:36 +00:00
01e83f0646
Final touches
2017-02-16 02:04:34 -06:00
ecb42d91fe
Fix bugs
2017-02-16 02:04:34 -06:00
e7dbe48937
Block morph rewrite
2017-02-16 02:04:34 -06:00
0befc7d967
Fixed issue with gadget command re-enabling after running
2017-02-16 02:04:02 -06:00
81f38cf06b
Give trainees find
2017-02-16 02:03:25 -06:00
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
cd387284bf
Ignore armorstands for fleshhook/snowball
2017-02-16 02:03:25 -06:00
a879a1dc80
Item Map added
2017-02-13 18:18:32 +00:00
3a4e973551
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-12 13:12:53 +00:00
16773521b9
Lots of fixes
2017-02-11 17:18:39 +00:00
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
5e5b607fc8
Fix my goof
2017-02-09 22:44:00 -06:00
181f360f11
Merge branch 'update/cosmetics-valentines' into develop
2017-02-08 22:32:35 -06:00
06cc8a06c1
Added lore for cupid pet
2017-02-08 21:56:49 -02:00
452a128b2b
Added win room to love chest
2017-02-08 21:54:41 -02:00
22f6f243aa
Fixed hover effect
...
Fixed love chest lore being purple
2017-02-08 15:44:05 -02:00
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
5dcf028a37
Fixed win room being unlocked by default
2017-02-06 23:52:15 -02:00
1c96196359
Various changes for network security
2017-02-04 23:14:52 -05:00
f4a9253505
Remove pending bans on instant ban
2017-02-04 20:42:49 -05:00
511bfdecd7
Added lores and icons
2017-02-03 18:45:00 -02:00
6cc5a14073
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-03 20:33:54 +00:00
adb3386899
Added tracker for love chest
2017-02-03 18:32:29 -02:00
9669f626a1
Fixed issue with chest pages not turning to page 2
2017-02-03 18:31:32 -02:00
9024bb6569
Added custom floor for Love chest
2017-02-02 12:28:10 -02:00
8a3b531a06
Bawk Bawk Battles rewrite
2017-02-02 00:31:58 -06:00
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
d06c445e9c
Reduced amount of particles from love train mount
2017-02-01 11:38:13 -02:00
ea8a4d2786
Reduced amount of particles from love doctor morph
2017-02-01 11:37:11 -02:00
048272ef59
Removed heart particles from love wings
2017-02-01 11:36:12 -02:00
4a42ed42bd
Reduced amount of particles in love chest spawning
2017-02-01 11:35:31 -02:00
c0065ae696
Blow a kiss blowing kiss to yourself
2017-02-01 11:33:17 -02:00
c442c820f5
Disabled purchasing love chest with all the items unlocked
2017-02-01 11:29:50 -02:00
b5130181a2
Merging errors
2017-02-01 11:25:47 -02:00
c6bb850bc3
Lots of stuff
2017-01-30 23:28:55 +00:00
0ce741a5fb
Small wings for cupid pet
2017-01-28 21:38:14 -02:00
2cfd51e38e
Heart shaped wings
2017-01-27 17:40:35 -02:00
7200572583
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-26 20:10:48 +00:00
dd9f6e938d
Added small butterfly wings
2017-01-26 09:56:21 -02:00
b2d17f2680
Merge branch 'update/true-love-pet' into develop
2017-01-25 21:11:56 -06:00
70948b6967
Refactor PowerPlayClubItem instead of using an event
2017-01-25 21:10:32 -06:00
20efc234fa
Allow YT to use /disguise
2017-01-25 20:33:25 -06:00
692fcbacbb
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-24 17:18:29 +00:00
340f629f09
Changed knockback in winroom
2017-01-21 20:13:19 -02:00
9876c0c61c
Changed particles for wings
2017-01-21 19:58:59 -02:00
4c38a5878f
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-21 14:28:57 +00:00
3557fd8acc
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-21 14:21:03 +00:00
023ed5ed4a
Small fixes for win room
2017-01-20 22:12:01 -02:00
8ae74ce952
Increase 2FA window size
2017-01-20 15:42:21 -06:00
fbb1836eb5
Change Brawl fountain goal to 35M gems
2017-01-20 14:30:54 -06:00
a16acedb14
Google Sheets v2 finally
2017-01-20 20:08:24 +00:00
4bb51a3734
Fix non-[\x00-\x7F] characters breaking chat
2017-01-20 01:27:59 -06:00
7c829f8712
Filter duplicates, handle permissions in multicommand, support more commands
2017-01-20 01:27:59 -06:00
8b1fe8302e
Match Bukkit tab completion behaviour
2017-01-20 01:27:58 -06:00
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
8fdbe87d1d
Allow spaces when checking 2FA codes
2017-01-20 01:27:58 -06:00
fded8a6583
Change 2FA issuer on the test network
2017-01-20 01:27:58 -06:00
f23f04fdb1
Fix NPE in getOrLoadClient
2017-01-20 01:14:03 -06:00
8f72f9d087
Only require 2FA for MAPDEV+
2017-01-20 01:14:03 -06:00
66af3cc450
Fix parties mute bypass
2017-01-19 23:12:23 -05:00
34bf89187d
Added win room to gadget manager
2017-01-19 21:44:57 -02:00
d2c7e48903
Started on the battlefield win room
2017-01-19 21:17:17 -02:00
a6ab41fe3f
Fixed cupid pet
2017-01-19 21:14:15 -02:00
8a9a3cb2ac
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-19 21:16:12 +00:00
36c0c56f27
World Events and Sheets rewrite
2017-01-19 21:15:06 +00:00
2fd0e72439
Changed type of love wings
2017-01-19 04:56:11 -02:00
da36276bc3
Changed permissions for unlockcosmetics command
2017-01-19 00:50:42 -06:00
6180162476
Now only remove on teleport if its void
2017-01-19 00:50:42 -06:00
704c787008
Fixed lava and void issues again, prevents CME
2017-01-19 00:50:42 -06:00
d7fe81184a
Better message when despawning balloons
2017-01-19 00:50:42 -06:00
0d1f3a0613
Fixed balloons dying on void
...
Fixed balloons bug near lava
Fixed balloons lore in menu
2017-01-19 00:50:42 -06:00
7f22872dd6
Changed OpenBalloons so it actually opens the balloons menu
2017-01-19 00:50:42 -06:00
a1a0271cd9
Added balloons to gadgets
2017-01-19 00:50:42 -06:00
9cba2aa9fc
Removed disabled balloons from chests
2017-01-19 00:50:42 -06:00
03aa049f40
Added balloons to chests
2017-01-19 00:50:42 -06:00
e3b56eda2a
Add 2FA reset command
2017-01-19 00:15:17 -06:00
9831c7259a
Enforce 2FA and re-enable unbans for trainee+
2017-01-18 23:47:47 -06:00
fd65f2df1b
Tab completion for /game set
2017-01-18 23:34:57 -06:00
6692432c42
Smart™ Tab Completion©®
2017-01-18 23:30:39 -06:00
e5ece844cb
Tab completion
2017-01-18 23:20:56 -06:00
c5d5d86c1d
Use CoreClient instead of Player in case the player quits
2017-01-18 23:20:24 -06:00
ac63985419
Revert removing strict anticheat
2017-01-18 23:20:24 -06:00
cdc4f3debd
Don't try to reload client if already loaded
2017-01-18 23:20:24 -06:00
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
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
ed8363e1be
Added items to infused chests
2017-01-18 20:57:54 -02:00
4cdb652b79
Removed winter items from infused chests
2017-01-18 20:35:17 -02:00
ad9caa68a0
Small change to treasure page
2017-01-18 20:34:16 -02:00
f93794f14d
Removed permissions for snr mods to use unlock cosmetics
2017-01-18 20:31:35 -02:00
6ba1901490
Revert "Revered changes to chest page"
...
This reverts commit 419c4b1053
2017-01-18 01:07:50 -02:00
419c4b1053
Revered changes to chest page
2017-01-18 00:52:36 -02:00
3e16c7fdf0
Added items to love chest (missing win room)
2017-01-17 23:34:16 -02:00
d49e85c21a
Corrected chances for love chest
2017-01-17 23:30:29 -02:00
447a1cee18
Removed unused code
2017-01-17 23:28:19 -02:00
09c43ce73b
Added love chets to titles tracking
2017-01-17 23:26:09 -02:00
65cc1b598d
Change Flame Rings icon
...
Fixed issue with buy chest button
2017-01-17 21:08:38 -02:00
75ede7f823
Fixed present danger display item
2017-01-17 20:21:37 -02:00
27aa682727
Stops players from purchasing the chest
2017-01-17 20:20:17 -02:00
76b356f73c
Removed gingerbread chest
2017-01-17 19:24:27 -02:00
1a580251e9
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-17 09:51:17 +00:00
cdd1e63989
Ops, are we back in time? Fixed lore saying 2012 instead of 2017
2017-01-17 06:30:47 -02:00
ccd490b41a
Added love chest
2017-01-16 21:06:24 -02:00
819741d8ff
Removed gadget selection since it will only work during games
2017-01-16 19:55:28 -02:00
a70c8eccc6
Blow a kiss taunt
2017-01-16 19:43:49 -02:00
ddc098649f
Cupid Pet
2017-01-16 19:28:06 -02:00
694b2f69b2
Love train mount
2017-01-16 19:02:22 -02:00
ebfd6e5cc5
Use correct way for adding pets to ppc
2017-01-16 04:19:57 -02:00
c571736def
Silent villager
2017-01-16 01:57:42 -02:00
9e4f756fe8
Even better way of making pet circle around you
2017-01-15 02:46:44 -02:00
7600cd6e04
Added enderman gun
2017-01-15 00:07:48 -02:00
46552428a4
Make them slower
2017-01-14 23:55:24 -02:00
6e399b10db
Increased radius
2017-01-14 23:27:02 -02:00
3d49eb2181
Better way to handle the circle points
2017-01-14 23:21:49 -02:00
2398fbc8c9
Added correct ppc lore
2017-01-14 23:15:41 -02:00
6c75f6e7dc
Showing correct icon for pets
2017-01-14 23:12:31 -02:00
fb05a08e91
Merge branch 'develop' into update/true-love-pet
2017-01-14 23:10:20 -02:00
e03b59bb7c
Added love wings to gadget manager
2017-01-14 22:22:17 -02:00
03c2ec56b7
Added love wings
2017-01-14 22:21:38 -02:00
33cb3b74fc
Added love doctor morph to gadgetmanager
2017-01-14 22:11:25 -02:00
fa9f895891
Use the correct event
2017-01-14 21:01:18 -02:00
d667524ed9
Love Doctor Morph
2017-01-14 20:50:44 -02:00
2976eab5bf
Added particles
2017-01-14 20:06:12 -02:00
8c11f2c4cb
Added True Love Pet
2017-01-14 18:57:40 -02:00
ef53ae5737
Reinstate missing _showInterface check
2017-01-14 13:59:06 -06:00
5ba3fac58c
Check twofactor status instead of interact events
2017-01-14 01:29:37 -06:00
babc72a87c
Fixed lore
2017-01-13 23:31:22 -06:00
1a5a530133
Fix Evolution crash
2017-01-13 23:30:13 -06:00
bb2477676c
Add missing diff from PP-Bizon fix
2017-01-13 14:24:48 -06:00
89ccaf4323
Disable hotbar items when authenticating with 2FA
2017-01-13 01:14:31 -06:00
251eb2e53e
Let's be legal
2017-01-12 23:22:40 -06:00
e82d1b5885
Remove spigot as a dependency from ServerData
2017-01-12 23:22:39 -06:00
2bb8023b47
Changed chest spawn animation
2017-01-12 18:20:19 -06:00
4a803c1482
Fixed NPE, weapon name is now back at the lore
2017-01-12 18:20:14 -06:00
85eb38032f
Added minestrike chest to treasure hunt track
2017-01-12 18:50:55 -02:00
9385144566
Lowered the cost from 20000 to 10000
2017-01-12 16:52:36 -02:00
353cefe949
Added weapon name after skin name
...
Changed lore and icon of MS chest
2017-01-12 16:36:29 -02:00
3d64319180
Missing commands
2017-01-12 18:03:40 +00:00
8d47e80066
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-12 18:03:07 +00:00
132036bd17
Move Constants to common
2017-01-11 20:42:46 -06:00
39ba03d1b4
Convert to UtilServer.isTestServer
2017-01-11 20:29:36 -06:00
19ac8f0c3b
Create framework for proper test network
2017-01-11 20:29:36 -06:00
5c4cc48e86
More QA changes
2017-01-11 19:50:26 -06:00
4fd92a3402
Fix remainder of parties bugs
2017-01-11 19:50:26 -06:00
56d4ed9e11
Parties rewrite
...
Basically everything got changed. Also Portal has a slightly better API
now
2017-01-11 19:50:26 -06:00
91773de97e
Don't use metadata for two-factor auth
2017-01-11 16:17:03 -06:00
cea08cae67
Merge branch 'update/cosmetics-balloons' into develop
2017-01-11 15:32:41 -06:00
5a2ed59a38
Make Strike Games an actual game, disable Hunger and remove food from loot
2017-01-11 15:29:50 -06:00
28a83ef722
Don't delete old client when being replaced (solves enjin listener issue)
2017-01-11 15:28:59 -06:00
cbe238c83d
Don't give book on join
2017-01-11 15:11:57 -06:00
716c77451e
Update the right titles
2017-01-11 15:11:57 -06:00
fbaeffc96e
Remove EventHandler annotation
2017-01-11 15:11:57 -06:00
cb13fb1ccc
1.8 titles!
2017-01-11 15:11:57 -06:00
bcea0044e8
Animated Titles!
2017-01-11 15:11:57 -06:00
0bb01d39b6
Fix PP-Bizon skin
2017-01-11 15:07:48 -06:00
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
0a655932af
IntelliJ removed an import after I commited last time
2017-01-11 15:50:53 -02:00
5e85f48c87
Fixed balloons still being added to chests
2017-01-11 01:54:53 -02:00
21473a7d82
Fixed merge conflict
2017-01-10 21:27:47 -02:00
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
64026f81ff
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-01-08 21:12:28 +00:00
0218965bee
Villager trading and loot upgrades
2017-01-08 15:44:04 +00:00
cbc5ed491c
Check two-factor status for every player on login
2017-01-05 19:16:28 -07:00
96c15376aa
Use default 2FA window size (3)
2017-01-05 15:20:10 -07:00
435abbba08
Allow builders to use 2FA
2017-01-05 10:48:56 -07:00
a2472f45b4
Cancel commands when authenticating with 2FA
2017-01-05 10:44:03 -07:00
3af401ee8f
Implement two-factor authentication
2017-01-04 20:33:09 -07:00
571840e249
Lots more changes
2017-01-02 14:40:13 +00:00
17bdfe6814
Started on the flying mechanics stuff
2016-12-30 12:44:49 -02:00
1aca03b22d
Added balloons to normal chests
2016-12-30 12:17:52 -02:00
ef7bbfe7eb
Added Balloons to omega chest
2016-12-30 12:10:26 -02:00
9578864f8a
Added display item
2016-12-29 21:49:20 -02:00
9ec8835374
Fixed block balloons!
2016-12-29 21:40:02 -02:00
16e40c2896
Added shotgun skin
2016-12-29 19:18:09 -02:00
fcec0399cd
Added remaining skins to chest
2016-12-29 19:08:31 -02:00
5f0de2e5e3
Allows 2 chests to be opened and dupes for minestrike chest
2016-12-29 18:04:24 -02:00
c877f20031
Added other skins, forgot this on the last commit
2016-12-29 18:00:18 -02:00
025a43b519
Added ms skins to their own chest, and added chest to page
2016-12-29 17:58:48 -02:00
36303a0fe8
Added new minestrike skins (some, at least?)
2016-12-29 17:43:50 -02:00
8131656ae2
Changed RankReward to have Eternal rank
2016-12-29 17:06:07 -02:00
4c6298bb63
Merge branch 'develop' into update/cosmetics-balloons
2016-12-29 16:28:13 -02:00
6478656501
Fixed armorstand balloon types
2016-12-29 16:25:20 -02:00
0ba22f9201
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-28 22:33:04 +00:00
efea2b0c1d
Merge branch 'feature/dinnerbone-morph' into develop
2016-12-28 15:19:06 -07:00
4c7f5c5716
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-27 18:59:03 +00:00
e114ab03b5
Chest spawning
2016-12-27 17:20:53 +00:00
0b4d217303
Reduce number of redis requests by communities
2016-12-26 22:34:09 -07:00
c685486086
Fixed some types of entities
2016-12-27 00:58:16 -02:00
5198d64ab8
Added all the balloons!
2016-12-27 00:29:48 -02:00
092cde9973
Renamed to BalloonData
2016-12-27 00:01:42 -02:00
cd70305afb
Make leashes not break (WITHOUT packets ;))
2016-12-26 23:17:04 -02:00
f25c592a6d
Removed commented code
2016-12-26 22:20:23 -02:00
78510ffbbf
Allows multiple balloons
2016-12-26 22:19:08 -02:00
5e420a20d8
Changed temporary display item so it doesn't bug with 1.11
2016-12-26 20:21:43 -02:00
d19d661c7d
Modified pets so they don't make different sounds anymore :toot:
2016-12-26 19:02:35 -02:00
6712ad427b
Added bat so players can use items in hand with the leash
...
Changed silence method so it works :toot:
2016-12-26 19:00:11 -02:00
c11755558e
Ops, those comments are wrong...
2016-12-26 18:27:01 -02:00
1d2a538fd6
Renamed Balloons page name
2016-12-26 18:23:27 -02:00
b422832276
Fixed Cosmetics menu positions
2016-12-26 18:22:57 -02:00
4ebc82bf1f
Added balloons
2016-12-26 18:10:42 -02:00
a4a039b619
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2016-12-25 22:09:03 +00:00
fb9720c926
Added padding to menu
2016-12-25 16:21:46 -02:00
7e6810e10f
Added a balloon to the menu
2016-12-25 16:12:05 -02:00
45d4e5ce6e
Added Balloons to the cosmetics menu
2016-12-25 16:01:49 -02:00
246db919d9
Changed permissions for Unlock Cosmetics
2016-12-25 15:35:53 -02:00
de73307754
Added morph to january ppc prize
2016-12-25 15:35:25 -02:00
140da98922
Merge branch 'develop' into feature/dinnerbone-morph
2016-12-25 15:34:00 -02:00
10bed92a6a
Change morph description
2016-12-24 17:38:29 -05:00
fe8823c134
Re-order morphs
2016-12-24 17:38:09 -05:00
81d769db5b
Fix issues regarding disguising
2016-12-24 14:18:33 -05:00
eacbdfdb02
Convert morph to packets
2016-12-24 14:07:41 -05:00
73cefb69c9
Use redis pipeline for community player statuses
2016-12-24 00:39:59 -07:00
08d65f3662
Load communities with 4 queries instead of 3n+1
2016-12-23 21:33:17 -07:00
0aec8889fa
Added lore
2016-12-23 23:56:43 -02:00
35a9eabf74
Use UUID object instead of String for PlayerStatus and FriendStatus, as well as update CommunityJoinRequestInfo on a task
2016-12-23 18:34:52 -05:00
74a6071d4e
Refactor Redis PlayerStatus to use UUID as a key instead of Name, and make communities not force every server to subscribe to join publishes from proxies
2016-12-23 18:03:08 -05:00
samczsun
LCastr0
Sarah
Sam
cnr
Alexander Meech
Lucas de Castro Queiroz
AlexTheCoder
md_5
Shaun Bennett
Nate Mortensen