Commit Graph

3962 Commits

Author SHA1 Message Date
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
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
LCastr0
ff6a3e915e Add Gold Pot Morph 2017-02-28 23:12:07 -06: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
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
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