Commit Graph

281 Commits

Author SHA1 Message Date
cnr 599f391001 Fix build (typo) 2017-06-16 22:36:33 -05:00
Alexander Meech 10df654e42 Track enjin/support-given clans boxes in CUST-1 2017-06-16 18:36:38 -04:00
Alexander Meech 4e8838d99e Add Clans Dye Box and Clans Builder Box to CUST-1 2017-06-16 18:23:11 -04:00
Alexander Meech 93a316e5e3 Add clans box sales package 2017-06-16 18:20:21 -04:00
cnr 8e9c5c43e4 Remove unused agentCacheMap in CUST 2017-06-14 19:57:58 -05:00
cnr 8d1aa176d3 Remove unused agentCacheMap in CUST 2017-06-13 23:49:14 -05:00
cnr c533b170fe Add /checkppc to CUST for detailed subscription data 2017-06-13 23:47:30 -05:00
Alexander Meech bc38d895a0 Update CUST-1 to track Spring Chests 2017-04-16 16:53:18 -04:00
cnr da5df8dae2 Merge remote-tracking branch 'update/aprilchest' into develop 2017-04-12 23:03:47 -06:00
Alexander Meech 176107c848 Update the setup of CUST-1
Should probably make this dynamic at some point......
2017-04-12 23:02:53 -06:00
LCastr0 4388a7f70e Changed lenght (missed one thing) 2017-04-08 23:17:39 -03:00
LCastr0 7db5805f16 Fixed lenght 2017-04-08 23:11:41 -03:00
LCastr0 8a7f221bc6 Added spring chest to cust server 2017-03-24 14:20:10 -03:00
samczsun 5349f53bfe Fix St Patricks Chest info 2017-03-17 00:50:14 -05:00
LCastr0 63b4dd1053 Support server stuff 2017-03-06 17:33:36 -03: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
Sam 3a4e973551 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-12 13:12:53 +00:00
cnr 181f360f11 Merge branch 'update/cosmetics-valentines' into develop 2017-02-08 22:32:35 -06:00
Sam 6cc5a14073 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-02-03 20:33:54 +00:00
AlexTheCoder 16c155ffe8 Reorganize player data representation for better combating chargebacks 2017-02-02 00:23:05 -06:00
LCastr0 1557f3a39c Added love chest to customer support server 2017-01-18 21:02:57 -02:00
Sam 1a580251e9 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2017-01-17 09:51:17 +00:00
cnr 66bff40040 Update StaffServer whitelist 2017-01-13 21:52:02 -06: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
samczsun 132036bd17 Move Constants to common 2017-01-11 20:42:46 -06:00
samczsun 19ac8f0c3b Create framework for proper test network 2017-01-11 20:29:36 -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
Sam a4a039b619 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/gem-hunters 2016-12-25 22:09:03 +00:00
AlexTheCoder 1cb6151817 Allow CUST-1 to set players to ETERNAL via support commands 2016-12-21 19:31:56 -07:00
AlexTheCoder dad7346313 Fix incorrect placement of thankful chest on cust server display 2016-12-21 19:31:56 -07:00
LCastr0 e8d698ac37 Fixed eternal taunt
Added description for taunts
Added eternal taunt description and icon
Removed minestrike chest for now
Removed debug commans permissions
2016-12-21 15:55:52 -07:00
LCastr0 56003cccab Added Minestrike Chests tracking for support 2016-12-21 15:55:51 -07:00
samczsun 87eaeabd7f Document and clean up StatsManager 2016-12-14 19:52:13 -07:00
samczsun d291521ad1 Clean up DonationManager 2016-12-14 19:52:13 -07:00
LCastr0 97ce2d0ae6 Gingerbread Cosmetics
Adds the following:
- Gingerbread Chests
- Holiday Tree particle
- Freeze Suit
- Winter Warfare win effect
- Present Danger Win Effect
- Gingerbread Man pet
2016-12-01 23:39:33 -06:00
AlexTheCoder e85ee39ac5 Set up support server with Thankful Chest tracking and Eternal Rank 2016-11-23 23:43:42 -05:00
LCastr0 b862a30c76 Thanksgiving Cosmetics (#278)
* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* Added chickens to Holiday Manager (Thanksgiving)
Added TextEffect
Moved all the effects to a different package to make it easier to find
Added method in Effect to get the Effect Location

* Removed(?) wildcard import

* Testing New year thing
Added some symbols to UtilBlockText

* Allow multiple pets with the same EntityType

* Added Stray Morph
Added Shulker Pet
Added code for a possible new year effect
Added Metal Man Morph to the menus
Added Metal Man Morph as an yearly bonus for PPC subscriptions

* I seriously don't remember what is in this commit, I'm just doing it to
fix the thing with develop...

* Fixed Pet menu
Fixed morph menu
Changed from List to Set

* Changed from PurchasUnknownSalesPackage to AddUnknownSalesPackageOwned

* Added Santa Morph
Removed Sleigh Morph
Changed all the cosmetics GUIs to start on the second row, instead of the first

* Changed some stuff from Holiday Manager so now chickens will walk around when spawned

* Added sound effects to Metal Man
Added slowness to Metal Man

* Added new lore for the Metal Man Morph description
Added Stray Morph Ability
Fixed some problems with the Thanksgiving Chickens

* Added Fated giveaway manager and animation
Moved titan and fated giveaway managers to a new package

* Fixed lores for Stray morph and Shulker pet
Changed ability of Stray morph

* Removed Stray and Shulker pet from the menu
Deleted Pet class since it was not being used
Changed position of achievement on the menu
Changed color of chicken's name
Changed colors of Power Play message
Stray morph, Santa morph and Shulker pet are hidden from the menus for now
Removed feathers dropping from chickens, changed them to snow particles

* Added hover ability to Metal Man Morph

* Fixed some stuff on Metal Man
2016-11-17 02:06:00 -05:00
Alexander Meech 1f69c204f6 Fix Trick or Treat Chest Logging in Cust Server 2016-11-02 16:47:38 -04:00
AlexTheCoder ab228fb492 Implement trick or treat chest in customer support server 2016-10-25 13:34:22 -04:00
samczsun 09fe7b736a Don't enable debugging 2016-10-19 22:38:39 -04:00
AlexTheCoder 2e280d62de Block rain on the support server 2016-10-19 22:35:17 -04:00
AlexTheCoder 6d9d42cfdd Allow pets to be given from the support server 2016-10-19 22:35:17 -04:00
cnr 8e7ae7f55f Make Power Play status clearer on support server 2016-10-14 00:26:33 -05:00
LCastr0 9f66bf438c Fixes for the CustomerSupport server 2016-10-06 12:43:19 -04:00
Shaun Bennett a6727bf104 Halloween Fixes/Prep 2016-10-05 22:57:44 -04:00
Alexander Meech dae3c60247 Make support text for power play claims more accurate (#228)
* Make support text for power play claims more...

...accurate

* Reverse text
2016-10-05 17:13:32 -04:00
LCastr0 8da5813f29 Add Halloween Cosmetics (#227)
* Internal:
Changed imports from java.awt.Color to org.bukkit.Color

External:
Added Double Jump Halloween
Added Arrow Trail Halloween
Added Pumpkin Hat

* Internal:
Fixed Arrow Trail Halloween
Added new methods to ParticleData
Renamed playerNPC to _playerNPC (WinEffectLavaTrap)
Removed unecessary method (WinEffectManager)
Added a command to test win rooms properly
Fixed Squid Morph not showing name unless players hovered over it
Created a Manager for the Morphs so we avoid using deprecated methods

External:
Added Halloween Win Room
Added Grim Reaper Morph
Added Headless Horseman Morph
Added Nightmare Steed

* Internal:
Renamed RewardType enums to have upper case

External:
Added Halloween Death Effect
Added Haunted Chest
Added Baby Zombie Jockey Pet
Changed the names of the items
Added Grim Reaper pet

* Slack integration to test stuff (Will not be in the code in the last commit)

* Fixed Grim Reaper Hoe not being removed after the morph is disabled

* Details for the Haunted Chest

* Details for all the items (lores, icons, texts, effects, etc)
Removed Headless Horseman Morph

* Fixes for lores and names
Support server stuff

* Fixes for the Lock and Unlock cosmetics commands

* Fixes for the Grim Reaper Morph

* Fixes for the Grim Reaper Morph
Removed debug messages

* Fixed a memory leak. Thanks to Sam

* Fix imports

* Removed unused code
Added javadocs to UtilTextBottom#displayProgress()
Added javadocs to UtilAlg#getRandomLocation()

* Removed Death Effect
Increased Arrow Trail particles
Increased Double Jump particles
2016-10-05 10:27:45 -04:00
cnr e867a09b5c Update support server to accommodate power play changes 2016-09-30 21:52:07 -07:00
AlexTheCoder a124aa3d85 Fix items added via support server not showing up in customer service logs 2016-09-05 20:25:02 -04:00
AlexTheCoder ffb6073532 Fix unnecessary calls to mysql/mssql databases in support server 2016-09-04 23:44:54 -04:00
AlexTheCoder b5771550ad Fix titan command not being registered 2016-09-04 23:28:25 -04:00
AlexTheCoder 866c3ee7c9 Add a command to allow support agents to check for ownership of internal sales packages 2016-09-04 22:11:05 -04:00
AlexTheCoder 3088d79cf5 Update support packages 2016-09-03 15:16:59 -04:00
AlexTheCoder 09a535466a Fix clan banner being removed from support server information 2016-09-03 11:37:45 -04:00
cnr c9358d8c5a Add power play to support server 2016-09-02 19:10:30 -05:00
cnr 2bce540c5d Disable Antihack in the staff server 2016-09-02 02:51:34 -05:00
AlexTheCoder 9abbe1bfb9 Update support whitelist and op list 2016-09-02 00:10:36 -05:00
TadahTech 3b9d6adfbc Lobby Update 2016-08-23 01:37:07 -05:00
samczsun 7de9da3d1c Complete rework of disguising and antihack hook
This commit completely rewrites DisguiseManager, DisguisePlayer, and
PlayerDisguiseManager.

Changes to disguising means that much of the core was also changed,
primarily having to do with mapping by UUID versus player names.

Several new API classes were added, such as EntitySelector, Managers,
UtilTasks, and a brand new scoreboard API which is much more optimized and
allows for much longer lines

The new anticheat is hooked as well, with implementation for guardians
which follow the players around. Release two code is also included, but is
currently disabled via a boolean.
2016-08-10 21:03:30 -04:00
AlexTheCoder 96e0625548 Fix mislabeling of shop item in user display 2016-07-29 03:15:22 -04:00
AlexTheCoder f3944527f8 Display clans purchases properly in support server 2016-07-28 19:08:24 -04:00
AlexTheCoder aef94e13a8 Fix message not being sent 2016-07-28 04:18:29 -04:00
AlexTheCoder 031a9575ae Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans 2016-07-27 15:13:18 -04:00
cnr 3d0cc2a5fd Refactor Clans gold dependency out of core 2016-07-27 13:52:03 -05:00
AlexTheCoder 818ed4c9a9 Set up clans monetization features in the shop and fix some hardcoded names in core 2016-07-22 00:18:34 -04:00
AlexTheCoder 2b74ec00b4 Change display menu for CUST-1 server to reflect recent updates 2016-07-02 01:32:47 -05:00
AlexTheCoder e4c94f5421 Fix whitelist for Customer Support servers 2016-07-02 01:32:42 -05:00
LCastr0 d75abe3aea Persistence fixes 2016-06-25 00:36:00 -03:00
LCastr0 83f4b25887 Testing persistence fixes 2016-06-25 00:33:36 -03:00
Shaun Bennett fd843b88cb Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
#	Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
Shaun Bennett a9f291338f Amplifiers GM Candidate 2016-06-23 22:49:12 -07:00
LCastr0 7749314e64 Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-23 16:11:49 -03:00
LCastr0 a441727e09 Freedom update:
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
Shaun Bennett e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
LCastr0 ed68ef332b Fixes for Win Room (Players were able to see other players)
Added command to allow other players to run ranked commands
Fixes code styles
2016-05-22 21:05:48 -03:00
LCastr0 0109e2f2dd Fixes for Illuminated chest
Fixes for /check command (Support)
2016-05-20 23:33:58 -03:00
Ben 35c7b9a2bd Incognito Updates:
-ADD: Prompt in Tab to identify who is in vanish (Can be a * or [Vanish])
-ADD: Make it so /stats don't work on vanished staff.
-ADD: Make sure it can be toggled off on /vanish again or network leave. Staff get stuck with it when resigning. Should stay on in-between lobbies.
2016-05-17 18:10:07 -05:00
AlexTheCoder b4c5be81f3 - Fixed random weather in MCL
- Added Elo Division display to /stats for applicable games
- Made fishing rods kept on death in MCL
2016-04-27 23:12:38 -04:00
Ben a04f7c23c6 Disable incognito for staff in hub invisibility, and vice-versa 2016-04-08 20:18:56 +01:00
Ben 876a7a8eb6 Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-05 12:37:23 +01:00
Ben 7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Jonathan Williams 8ea0051181 Fixed customer support menu not showing if monthly bonus hasn't been claimed. 2016-04-04 17:46:03 -05:00
Jonathan Williams 400d2f0cca Added bonus log view for customer support. 2016-04-04 00:59:13 -05:00
NewGarbo 67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo 441cf702c7 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-19 07:22:09 +00:00
NewGarbo d5583b93f2 remove eclipse files 2016-02-19 07:14:13 +00:00
Shaun Bennett 7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
Shaun Bennett 684a40db41 Fix giving TITAN in Staff Server 2016-02-16 16:55:00 -06:00
Shaun Bennett eca400278c Support server update 2016-02-12 05:00:09 -06:00
Shaun Bennett dfd61833b7 Valentines changes 2016-02-12 03:03:47 -06:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
md_5 bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Mysticate 0f5be6444b Yo shaun debug this m8 ty 2015-12-21 02:23:59 -05:00
Jonathan Williams 2953fe395f Changed dns api key to new key.
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
2015-12-17 18:33:49 -05:00
Jonathan Williams 222173ab17 Improved and implemented GameProfile caching. 2015-12-11 01:24:59 -05:00
Jonathan Williams b6f6d4458e Fixed StaffServer. 2015-11-28 01:43:00 -06:00
Jonathan Williams 6e90052480 Updated StaffServer to 1.8 2015-11-10 02:01:39 -06:00
AlexTheCoder c518221f6b - Fix Merge Error 2015-11-02 22:14:48 -05:00
AlexTheCoder c41d01e213 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes
Conflicts:
	Plugins/Mineplex.StaffServer/.classpath
2015-11-02 22:09:18 -05:00
Jonathan Williams 3a0b8d75a2 Added new support member. 2015-11-01 22:09:50 -06:00
Jonathan Williams 5c2ade8270 Updated staff list. 2015-10-31 14:55:34 -05:00
Cheese c4e93180fa Merge branch 'master' into smash-champs-balance 2015-10-30 13:00:30 +11:00
AlexTheCoder 57da1d195a - Resolved randomly using java 8 in this one plugin 2015-10-24 20:50:47 -04:00
Cheese 6a173073a4 added flag to projectiles
work on cow kit
2015-10-12 14:39:14 +11:00
Jonathan Williams 512e08af19 Removed all create table statements. 2015-10-09 21:02:35 -06:00
Jonathan Williams 9f1c4653f4 Fix for Customer support item command with the removal of item categories. 2015-10-04 11:48:16 -05:00
Jonathan Williams 1417d31b73 Added 60s delay to timings enable check. 2015-09-11 23:57:26 -07:00
Cheese 106a7dab2e removed ability for entities to change blcoks in hub 2015-09-05 09:48:06 +10:00
Jonathan Williams 6f0309622c Removed AccountCache.
Converted that to PlayerCache and store account id in there.
2015-08-28 20:58:58 -07:00
Jonathan Williams e9b33668bc Added donorsOnline to MinecraftServer snapshot
Refactored Rank class to use lowercase methods.
2015-08-28 13:22:04 -07:00
Jonathan Williams 26ed7ebb94 Fixes to redis
Fixes for stat handler.
2015-07-26 08:49:35 -07:00
Jonathan Williams 84be48f264 Updated MiniDbClientPlugin to include accountId in the processLoginResultSet method.
Added conversion of stats to new stat table via StatHandler.

Changed stats value from int to long.
2015-07-25 01:30:50 -07:00
Jonathan Williams 7684e1837d Added new support staff to whitelist. 2015-07-10 15:31:38 -05:00
Jonathan Williams 77a63f72cc Updated staff server white list. 2015-07-09 11:07:16 -05:00
Jonathan Williams c1ef96bdcd Fixed jre for staff server 2015-06-26 03:12:00 -05:00
Jonathan Williams efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams 86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Jeremiah Bishop a05c2d085d Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars 2015-06-21 16:17:51 -04:00
Jonathan Williams 91b5beaff2 Fixed new Chat constructor requirement. 2015-06-20 03:43:38 -05:00
Jeremiah Bishop dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Jonathan Williams 476dd17ffe Fix for null rank in /c staff server. 2015-05-17 23:11:04 -07:00
Jonathan Williams d8ed866ada Fix for duplicate names in db.
Adjusted staff server whitelist and op list.
2015-04-21 23:35:41 -05:00
Jonathan Williams d25b39058a Fixed bunny morph name. 2015-04-03 04:19:48 -07:00
Jonathan Williams 0119e99adf Added EasterBunny package for support server. 2015-04-03 03:07:49 -07:00
Jonathan Williams 6472194d44 Optimized queries to retrieve and update player information by removing inner join calls on the account.
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
Jonathan Williams 294041b821 Removed Missing Coin application functionality from CustomerSupport server. 2015-03-25 15:05:06 -07:00
Jonathan Williams 3e17638bf0 Customer support re-add Dooskee. 2015-03-17 16:22:18 -07:00
Jonathan Williams 838df3f57a Added UUID lookup for saveRank call. 2015-03-13 17:52:25 -07:00
Jonathan Williams e776a9f886 Added new customer support agents to StaffServer 2015-03-12 15:32:35 -07:00
Jonathan Williams bf87cfd0cd Merge remote-tracking branch 'remotes/origin/sql_pooling' 2015-03-11 18:30:52 -07:00
Jonathan Williams 626bfc35fc Revert "Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections.""
This reverts commit 215ec7b00d.

Enabled multi-queries on db pool.
Cleaned up some code using new pooling getConnection inappropriately
2015-03-11 18:05:13 -07:00
Jonathan Williams 1ab43c9f44 Added new support agent to whitelist for customer support server. 2015-03-11 17:23:48 -07:00
Jonathan Williams 579ac8171d Hard-coded UUIDs for Staff Server to prevent UUID lookup Rate limits 2015-03-07 21:48:51 -08:00
Ty Sayers 215ec7b00d Revert "Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections."
This reverts commit adfe5fb74e.
2015-03-07 19:38:06 -05:00
Ty Sayers adfe5fb74e Implement usage of SQL connection pooling in RepositoryBase to prevent unnecessary idle connections. 2015-03-07 19:36:54 -05:00
Jonathan Williams 5e78b43860 Added StaffOnly code to ServerConfiguration 2015-03-02 12:33:04 -08:00
Jonathan Williams 5816da496d Adopted StaffServer project to refactors.
Added default rank package for staff server.
2015-03-01 01:09:22 -08:00
Jonathan Williams e6eb938b96 Delayed whitelist additions. 2015-02-20 23:29:19 -08:00
Jonathan Williams 17543910b5 Added Chest packages to support server.
Fixed Punish not loading.
2015-02-14 15:09:42 -08:00
Jonathan Williams fb563c9274 Fixed customer support whitelist names. 2015-02-09 00:16:20 -08:00
Jonathan Williams 08078c1622 Removed Logger 2015-01-22 23:18:38 -08:00
Jonathan Williams 8e04a2a5f2 Portal now checks server status and player's rank before sending them to a server to prevent login spam.
Refactored portal method names.
2015-01-11 00:42:31 -08:00
Jonathan Williams 47fc6e3b94 Revert "Added pool based repository and converted everything but account and donation repositories to it."
This reverts commit 8de8d31eec.
2015-01-11 00:41:40 -08:00
Jonathan Williams 8de8d31eec Added pool based repository and converted everything but account and donation repositories to it. 2015-01-10 11:53:25 -08:00
Jonathan Williams 86993ddd55 Fixes again for number player names. 2015-01-03 04:27:28 -06:00
Jonathan Williams 97f57b655b Prevent horses from spawning in Clans
Added Building supplies shop and pvp shop to clans.
2014-12-29 06:44:00 -05:00
Jonathan Williams 81e423fa4f Fixed Server transfer stuff. Portal send works! 2014-12-24 14:35:34 -05:00
Jonathan Williams eb5a7b4276 Added Legend package for support.
Refactored Key/Chest commands and added FrostLord package.

Removed password, added whitelist.
2014-12-24 03:41:17 -05:00