Sam
03d781ca70
It be April fools matey, walk yee plank
2017-04-01 02:11:11 -05:00
cnr
850b7b1aad
Merge remote-tracking branch 'update/aprilppc' into develop
2017-03-31 00:50:55 -05:00
Alexander Meech
10a1f71558
Add RustyDawgT to featured creators
2017-03-31 00:50:14 -05:00
LCastr0
ed39d5daa7
Reverted rename
2017-03-31 01:16:30 -03:00
LCastr0
911d5d20d2
Reverted rename
2017-03-31 01:07:00 -03:00
LCastr0
e8d6c321cd
Merge branch 'develop' into update/aprilppc
2017-03-31 00:40:38 -03:00
samczsun
4d32efe779
Not even disguises are safe from the NSA
2017-03-29 23:31:12 -05:00
samczsun
c8eab2596f
Move package because intellij is complaining
2017-03-29 23:31:12 -05:00
samczsun
affb2cb91f
PC-1395
...
Don't disable self otherwise a message is shown
2017-03-29 23:30:49 -05:00
samczsun
017d737e59
PC-1248 PC-1249
2017-03-29 23:30:49 -05:00
samczsun
52f09655e8
PC-1231
2017-03-29 23:30:49 -05:00
samczsun
63eed1abcd
PC-1210
2017-03-29 23:30:49 -05:00
samczsun
cb33bc7bed
PC-1187
2017-03-29 23:30:49 -05:00
samczsun
fc686ea497
PC-1182
2017-03-29 23:30:49 -05:00
samczsun
40648cf715
PC-1178
2017-03-29 23:30:49 -05:00
samczsun
23c52eed2c
PC-729
2017-03-29 23:30:49 -05:00
samczsun
3b8bda9dbd
PC-728
2017-03-29 23:30:49 -05:00
samczsun
99534e19c5
PC-599
2017-03-29 23:30:49 -05:00
samczsun
9256fe9903
PC-401
2017-03-29 23:30:49 -05:00
samczsun
26d3a77748
PC-368
2017-03-29 23:30:49 -05:00
samczsun
4f3cfaba43
PC-163 PC-200
...
Reset a player's spectator target when they switch servers
2017-03-29 23:30:49 -05:00
LCastr0
fec8a42fd7
Merge branch 'update/aprilchest' of https://github.com/Mineplex-LLC/Minecraft-PC into update/aprilchest
2017-03-28 17:29:05 -03:00
LCastr0
88db9c2913
Added Bugs Bunny to spring chest
2017-03-28 17:26:50 -03:00
Lucas de Castro Queiroz
60a688b5ac
Merge branch 'develop' into update/aprilchest
2017-03-28 11:55:14 -03:00
cnr
e3eac8b3ec
Enable 2FA for support
2017-03-27 23:37:45 -05:00
LCastr0
ae2768d354
Changed name, lore, icon and cooldown
2017-03-27 23:58:01 -03:00
LCastr0
8da2431415
Added bugs bunny quotes
2017-03-27 22:39:50 -03:00
LCastr0
cb5a63974e
Changed name of the item in PPC rewards
2017-03-27 20:21:46 -03:00
LCastr0
4f0110b942
Updated offset of the wings
2017-03-27 20:19:54 -03:00
LCastr0
235288af56
Changed wing shape again
2017-03-27 17:35:05 -03:00
LCastr0
3c241c48bc
Changed rabbit morph to spawn holograms
2017-03-27 17:26:18 -03:00
LCastr0
32bb2515f7
Changed height of skeleton
2017-03-26 01:26:43 -03:00
LCastr0
9ee6960038
Added bee wings
2017-03-26 01:25:08 -03:00
LCastr0
3837d9fbda
This should have been added in the last commit...
2017-03-25 18:38:43 -03:00
LCastr0
bff837ca9b
Fixed morph and possible fix for balloons, added lore and icon for particle effect
2017-03-25 18:36:12 -03:00
LCastr0
6875287b6d
Changed pets to Entities instead of Creatures
2017-03-24 16:52:37 -03:00
LCastr0
5464a74d2c
Added spring chest
2017-03-24 14:17:15 -03:00
LCastr0
d2851b0708
Merge branch 'develop' into update/aprilchest
2017-03-24 14:01:15 -03:00
LCastr0
64ed3e2e1b
Still trying with armor stands...
2017-03-24 13:45:36 -03:00
cnr
d95ed8d749
Disable /link and /unlink help messages
2017-03-23 23:22:33 -05:00
AlexTheCoder
3b2c50efa3
Remove magic values for PPC tag id and linked tag id
2017-03-23 23:18:29 -05:00
AlexTheCoder
1ff033de43
Refactor website link to use consumers instead of callbacks
2017-03-23 23:18:29 -05:00
AlexTheCoder
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
AlexTheCoder
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
cnr
9c504064c1
Force all players to reappear after win room
2017-03-22 22:41:08 -05:00
LCastr0
3b48a7caaf
Update armorstand to make it never fall
2017-03-22 16:55:49 -03:00
LCastr0
49bc6b8663
Removed gravity
2017-03-22 14:42:11 -03:00
LCastr0
47b88b7734
Added Spring set, added awkward bunny morph, added items to menus
2017-03-22 14:37:42 -03:00
LCastr0
788326fe54
Tried with armorstands, still not working :(
2017-03-22 13:11:14 -03:00
LCastr0
9afa829f89
Created new gadget item for PPC
2017-03-21 15:56:05 -03:00
LCastr0
4cd25ad921
Merge branch 'update/aprilppc' into update/aprilchest
2017-03-20 19:23:33 -03:00
LCastr0
d55690f904
Changed colors
2017-03-20 19:22:50 -03:00
LCastr0
8f7f52e222
Added lore and icon for Funeral Bouquet and corrected the price for spring items
2017-03-20 16:52:27 -03:00
LCastr0
33b933f465
Added lore and icon for Flower Power
2017-03-20 16:50:44 -03:00
LCastr0
540a0189b4
Added lore and icon for Flower Arrow
2017-03-20 16:49:20 -03:00
LCastr0
16f02d5bd4
Added killer bunny pet
2017-03-20 16:38:31 -03:00
LCastr0
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
LCastr0
5d2681ec97
Fixed some issues with menus!
2017-03-20 16:33:20 -03:00
LCastr0
defece04a9
Fixed some issues changing Creature to Entity
2017-03-20 16:33:20 -03:00
LCastr0
df4d0b117b
Possible fix for pet names not showing
2017-03-20 16:33:19 -03:00
LCastr0
f5a85f2a54
Spawns pet
2017-03-20 16:33:18 -03:00
LCastr0
13238eb4ad
Added equipment pages
2017-03-20 16:32:34 -03:00
LCastr0
e297f844e6
Renamed classes
2017-03-20 16:32:34 -03:00
LCastr0
137220d58f
Custom pets
2017-03-20 16:32:33 -03:00
Sarah
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
LCastr0
afad64bec3
Fixed CME
2017-03-20 08:49:20 -03:00
LCastr0
75ad5b9d51
Flowers where player walks
2017-03-20 08:23:32 -03:00
LCastr0
e1d9a568c9
Added flower as a hat
2017-03-18 00:49:12 -03:00
LCastr0
d8b68e4716
Multi colored circle
2017-03-17 20:01:48 -03:00
LCastr0
92f5214c91
Added spring halo particle
2017-03-17 19:39:41 -03:00
cnr
b464cab213
Add former St Patricks cosmetic names as alternatives
2017-03-17 00:52:41 -05:00
cnr
a0764443a8
Merge branch 'update/stpatrickscosmetics' into develop
2017-03-17 00:49:51 -05:00
samczsun
f6884fccd8
Change update protocol
2017-03-17 00:20:56 -05:00
samczsun
866b7bf63b
Better help message
2017-03-17 00:20:56 -05:00
samczsun
a1bad6d07e
QoL improvements
2017-03-17 00:20:55 -05:00
samczsun
e4cd809ce4
Teamspeak integration
2017-03-17 00:20:55 -05:00
LCastr0
561d4108c2
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-16 22:52:07 -03:00
LCastr0
2070f7b347
Fixed lore for taunts
2017-03-16 20:09:51 -03:00
LCastr0
3303f89c02
Added St Patrick's Chest to titles trackers
2017-03-16 20:07:10 -03:00
LCastr0
e3974b9228
Fixed lores
2017-03-16 19:56:52 -03:00
cnr
d64f50b98e
Don't combine require() and a method accessor
2017-03-16 01:13:54 -05:00
cnr
78b6846cf6
Add Titles to chests
2017-03-16 00:58:53 -05:00
samczsun
94009cd652
Final changes
2017-03-15 23:16:09 -05:00
samczsun
035f4637ba
Tracks in chests!
2017-03-15 23:16:08 -05:00
samczsun
d1993465a6
Add to online player if they're online
2017-03-15 23:16:08 -05:00
samczsun
ca5b4386f3
Nevermind, make a new command
2017-03-15 23:16:08 -05:00
samczsun
1cb118d3e5
Allow force giving items
2017-03-15 23:16:08 -05:00
samczsun
db2feeac42
Reorganize tracks, add BotB track
2017-03-15 23:16:07 -05:00
cnr
e5d2ad34eb
Merge branch 'update/stpatrickscosmetics' into develop
2017-03-15 23:15:10 -05:00
AlexTheCoder
572e461eb2
Remove stray debug text
2017-03-15 23:14:19 -05:00
AlexTheCoder
2dce455f93
Update Carl animation to use shards instead of coins
2017-03-15 23:14:19 -05:00
AlexTheCoder
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
LCastr0
a3861d43c4
Fixes costume throwing items without complete set
2017-03-14 13:32:49 -03:00
cnr
78a8e53d2e
Re-enable 2FA for Gem Hunters
2017-03-14 00:41:11 -05:00
LCastr0
2b988a02d8
Fixed horse
2017-03-13 19:39:14 -03:00
Sam
a231c0b031
Wooo finally!
2017-03-13 22:01:06 +00:00
LCastr0
c54cd066ef
Merge branch 'develop' into update/stpatrickscosmetics
2017-03-12 20:54:48 -03:00
LCastr0
401738f19a
Removed horse cooldown
2017-03-12 20:53:43 -03:00
Sam
7ab201f206
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-10 18:10:12 +00:00
AlexTheCoder
7ed485c7ca
Lets turn up the heat on this chess match...
2017-03-09 01:07:30 -06:00
AlexTheCoder
9fdcce525b
Make extreme prejudice a bit more sneaky
2017-03-09 01:07:30 -06:00
AlexTheCoder
b78ce421b5
Notify via redis when an extreme prejudice ban occurs
2017-03-09 01:07:30 -06:00
AlexTheCoder
1148283dff
Implement targeted GWEN-based discrimination against certain ip addresses
2017-03-09 01:07:30 -06:00
AlexTheCoder
a069d7ab59
Remove unnecessary INNER JOIN in sql to load a home server id
2017-03-09 01:04:50 -06:00
AlexTheCoder
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
AlexTheCoder
f2394da7dc
Give RewardManager access to StatsManager
2017-03-09 01:04:50 -06:00
AlexTheCoder
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
AlexTheCoder
7e70d02751
Properly award all values in BonusAmount wherever it is used for rewarding
2017-03-09 01:04:50 -06:00
AlexTheCoder
a4c875b4bd
Refactor Clans gold to be set from Core
2017-03-09 01:04:50 -06:00
AlexTheCoder
9591485bb6
Re-implement voting with Gem rewards and start refactoring Carl gold rewards
2017-03-09 01:04:50 -06:00
Sam
a9b53c8608
Gem Hunters Phase 2
2017-03-08 12:51:16 +00:00
LCastr0
3469b890d4
Rainbow taunt now uses sides of player as locations
2017-03-07 21:51:06 -03:00
LCastr0
1ffac1dd31
Drop nuggets when removing chests
2017-03-06 18:09:42 -03:00
LCastr0
ec5de0ef12
Merging issues
2017-03-06 17:10:29 -03:00
LCastr0
3cc304d99c
Used correct item for the mount
2017-03-04 23:52:12 -03:00
LCastr0
3d76f04508
Fixed rainbow taunt lagging players
2017-03-04 16:08:55 -03:00
LCastr0
f9b66e28f4
Fixed taunts not being disabled correctly
2017-03-04 14:07:24 -03:00
LCastr0
85b5eee92f
Fixed the rainbow taunt
2017-03-04 00:40:53 -03:00
LCastr0
d6605e973d
Changed chest animation
2017-03-03 23:38:32 -03:00
LCastr0
4a496ea4c1
Added particle for when opening the chests
2017-03-03 22:34:21 -03:00
LCastr0
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
Sam
4211682ca2
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-02 20:30:00 +00:00
LCastr0
28746c7873
St Patricks Chest
2017-03-02 15:50:56 -03:00
Sam
cfe2a07278
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-03-02 16:58:26 +00:00
samczsun
a0e79d87a2
Allow ops to use minecraft commands
2017-03-01 23:58:20 -06:00
samczsun
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
samczsun
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
samczsun
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
samczsun
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
Sam
13ffcbbd9b
Rewrite of logout npcs, lots of quests
2017-03-01 18:07:35 +00:00
LCastr0
ff6a3e915e
Add Gold Pot Morph
2017-02-28 23:12:07 -06:00
Sam
0ca4b2041d
Fix a CCE in MorphDinnerbone
2017-02-27 19:00:06 +00:00
Sam
7d5d5d5401
Re-enable 2fa
2017-02-25 15:47:24 +00:00
cnr
699845d6d7
Merge branch 'feature/gem-hunters' into develop
2017-02-25 00:40:05 -06:00
cnr
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
cnr
9450c29e3e
Allow ETERNAL into the beta
2017-02-25 00:31:12 -06:00
LCastr0
7201e0ec0d
Added taunt to menu
2017-02-24 22:08:36 -03:00
LCastr0
d471ac112e
Fixed rainbow taunt a bit
2017-02-24 22:08:04 -03:00
LCastr0
b2fd8ac748
Rainbow taunt
2017-02-24 22:06:18 -03:00
LCastr0
a32cb6ab2f
Mount
2017-02-24 19:39:54 -03:00
Sam
7be7b47395
Debug stuff
2017-02-24 22:11:27 +00:00
cnr
68f61bbb20
Send players to beta hubs; add 2fa and anticheat
2017-02-24 06:57:15 -06:00
cnr
eed784da04
Add beta whitelist to GemHunters and remove missing debug references
2017-02-24 06:57:00 -06:00
cnr
fb70c93f91
Add beta whitelist miniplugin
2017-02-24 00:46:05 -06:00
samczsun
60d9bd5d21
Move api to config file
2017-02-24 00:46:04 -06:00
cnr
9ece8c9959
Add beta whitelist miniplugin
2017-02-23 23:39:34 -06:00
LCastr0
8088cef29f
Leprechaun pet fixed
2017-02-23 20:12:11 -03:00
LCastr0
e731a91e40
Leprechaun pet
2017-02-23 17:35:50 -03:00
LCastr0
63cef754f6
St Patricks outfit
2017-02-23 14:57:52 -03:00
Sam
2b64de8ad1
Preparation for beta
2017-02-23 14:42:55 +00:00
samczsun
5b13a87500
Move api to config file
2017-02-22 23:32:56 -06:00
Sam
1b2c384afe
Mounts base
2017-02-21 09:56:08 +00:00
Sam
14f33ba494
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-18 10:35:19 +00:00
cnr
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
Sam
2657a98e70
Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters
2017-02-17 18:16:36 +00:00
samczsun
01e83f0646
Final touches
2017-02-16 02:04:34 -06:00
samczsun
ecb42d91fe
Fix bugs
2017-02-16 02:04:34 -06:00
samczsun
e7dbe48937
Block morph rewrite
2017-02-16 02:04:34 -06:00
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
