Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-12-02 07:23:29 +01:00
Code Issues Projects Releases Wiki Activity
1,207 Commits 1 Branch 5 Tags 105 MiB
54fde9353f
Commit Graph

957 Commits

Author SHA1 Message Date
Zrips
eccd0f506a Extra information when material is not a desired block 2019-10-29 16:05:04 +02:00
montlikadani
ec383bb28a Merge branch 'master' of https://github.com/Zrips/Jobs 2019-10-29 15:00:34 +01:00
montlikadani
9932ef47e5 Ignore deprecated methods usage 2019-10-29 15:00:16 +01:00
Zrips
1932648fd5 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-10-29 15:59:24 +02:00
Zrips
3b961ab9a3 Lets allow integers for item boosts 2019-10-29 15:58:35 +02:00
montlikadani
e03c0812ff Remove unnecessarry class register for browse 2019-10-29 14:54:00 +01:00
Zrips
64bbc0fe29 Limiting top list to defined amount 2019-10-29 15:50:40 +02:00
Zrips
eed6e56840 Allow leaving job by using middle mouse click 2019-10-29 15:39:18 +02:00
Zrips
804da86dc1 Lets use CMI Gui handling instead of messy old one 2019-10-29 15:37:31 +02:00
Zrips
184430f4f6 In case locale is a string list and not a string line 2019-10-28 14:09:17 +02:00
Zrips
0a7072ffab Fixaru for multiserver compatibility issue 2019-10-28 13:55:18 +02:00
Zrips
0b1c035c4b Lets clear out block protection by set days limit on plugin load 2019-10-28 13:02:52 +02:00
Zrips
8e7a959f39 Lets switch autocommit when commiting in case its in true state 2019-10-28 12:49:09 +02:00
Zrips
9efaa425f2 Fix for new placeholderAPI hook not working correctly 2019-10-28 12:33:26 +02:00
Zrips
ebe321fc42 Missing locale for itembonus when you are not in that job 
Lets allow to not apply bonus to a negative income, this will change
previous default behavior and will not add bonus to negative income from
now on unless changed in config file
 2019-10-28 12:20:04 +02:00
Zrips
9f8d525fbc If MythicMobs are not present, lets return raw name 2019-10-28 11:36:02 +02:00
Zrips
db00657c89 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-10-28 11:31:46 +02:00
Zrips
adc3f8b385 This was a test code... 2019-10-28 11:31:36 +02:00
montlikadani
02a6a11cb7 Lets update translations 2019-10-28 10:00:23 +01:00
Zrips
7a52b9c94d Lets recalculate limits after levelup 2019-10-28 10:58:24 +02:00
montlikadani
d98bb4aaf9 Bake income should work now 2019-10-26 12:06:21 +02:00
montlikadani
c825a2de56 Rename cook to bake 
Correct English
 2019-10-26 11:37:40 +02:00
montlikadani
c36df666be Lets start working on Cook action 2019-10-26 11:30:58 +02:00
montlikadani
d740b534c3 Fixed server crash when adding block protections 2019-10-20 17:57:26 +02:00
montlikadani
558a0abfad Fix issue for other versions the getView() is not existent 2019-10-20 17:13:42 +02:00
Zrips
fb4f80c341 Updated words_ru file by Lexon2 2019-10-20 13:21:21 +03:00
montlikadani
e2629b4ea6 Better handling for jobs GUI interact 
- Minor loading improvement speed for connecting to the database
 2019-10-18 17:01:18 +02:00
montlikadani
c2e0dcd366 Lets try to fix inventory dragging issue on jobs browse 2019-10-17 19:06:00 +02:00
montlikadani
65d0b9a811 Change logic for reload 2019-10-16 20:21:50 +02:00
montlikadani
3b8ad58d05 Lets make async for convert sub-command 
- Some null checks
 2019-10-16 20:19:05 +02:00
montlikadani
d9beab45da Nothing 2019-10-06 17:51:11 +02:00
silas lankford
51742dc97d Fixed issue for beetroots when does not worked correctly in default config (#552) 2019-10-03 17:27:08 +02:00
montlikadani
020367fc5e Fixed issue for sign updates 2019-09-30 19:51:05 +02:00
montlikadani
f48e6dcec4 Speed up the version checking of papi 2019-09-26 20:44:20 +02:00
montlikadani
ac9bfcc0b0 Do not hide the item from shop 2019-09-26 20:07:26 +02:00
montlikadani
f894a6aa09 Added option to jobs shop to hide icon if a player there are no enough points 2019-09-25 19:08:48 +02:00
Zrips
6dfd0d94e8 Table conversion to use ID's 2019-09-24 12:27:32 +03:00
montlikadani
865ad64c18 EditQuests sub-command should work now 2019-09-23 18:14:02 +02:00
Yiğit Duman
0057bd3aba Fixed issue when used 1.12 and lower versions then some materials not work correctly (#550) 2019-09-23 17:43:53 +02:00
montlikadani
f0ce3fcdc4 Re-add deprecated pointsData method to prevent issue from plugins 2019-09-23 15:32:43 +02:00
Zrips
9a73f1eb0d Don't force economy to be done in sync... 2019-09-22 11:51:07 +03:00
Zrips
5c7c4621e5 SqLite has different syntax for unique column definition 2019-09-22 11:28:46 +03:00
Zrips
b568195624 Lets check NPE 2019-09-22 11:19:54 +03:00
Zrips
f02902fb1e Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-09-22 11:18:57 +03:00
Zrips
e1cddfa8c8 Extra update 2019-09-22 11:18:43 +03:00
montlikadani
5600b3af6f Quest objective amount is now optional (default 1) 
- Some fixes for saving quest objectives
 2019-09-20 21:23:27 +02:00
montlikadani
1513e32afc Added option to leave from job in jobs GUI 2019-09-20 16:20:43 +02:00
montlikadani
5d856f0fbc Jobs toggles will not be saved from now instantly when get income 2019-09-19 20:22:07 +02:00
montlikadani
2cfff7a53b Lets update locales 2019-09-19 18:29:32 +02:00
montlikadani
71fe75c884 Lets add editquests strings and fix some issues 2019-09-19 18:12:36 +02:00
Zrips
e077c5f02d First iteration to use ID's instead of full name String, saves space 2019-09-19 18:54:59 +03:00
Zrips
beb9ef76a9 Lets upgrade JobsPaymentEvent to properly handle all payments types 2019-09-19 14:11:45 +03:00
Zrips
fae5d65a88 Lets upgrade BufferedPayment 2019-09-19 14:01:24 +03:00
Zrips
cb67b23c94 Lets check for possible NPE 2019-09-19 13:34:40 +03:00
Yiğit Duman
6f4501ff05 Fix for showing messages without payment (again) (#543) 2019-09-16 18:27:50 +02:00
Yiğit Duman
41d2e04b50 Fixes #541 and some duplication bugs (#542) 2019-09-16 16:53:23 +02:00
montlikadani
0f9ed9e2c6 Lets start working editquests sub-command 2019-09-14 16:22:59 +02:00
montlikadani
6cd52625e2 Should fixed issue when the JobsPrePaymentEvent getJob method always returns null 2019-09-14 16:14:38 +02:00
Yiğit Duman
b0aaeb346e Get the job original name from config instead of section name (#537) 2019-09-14 16:08:51 +02:00
Yiğit Duman
8df5ec581f Fix bone meals dupping issue when interacted with seeds (#535) 2019-09-14 15:31:55 +02:00
Yiğit Duman
ab2405eaff Fixed 1.11 & 1.12 entities don't work (#533) 2019-09-14 14:30:23 +02:00
montlikadani
648c6f412a Fixed money dupping issue when left clicked to block and earn income 2019-09-14 13:27:27 +02:00
montlikadani
b42e1002e5 Added option to ignore boosted items in offhand 2019-09-12 15:27:34 +02:00
montlikadani
cfc0453cfc Added new placeholder: %jobsr_user_job% 
This placeholder will show the player job, which job is specified in the placeholder value.
 2019-09-11 16:33:35 +02:00
montlikadani
ab9ae0da1b Added method to get the fullName from job 2019-09-06 14:59:52 +02:00
montlikadani
f19138db4d Fixed signs updating 
- Level, exp adding and taking amounts now correctly calculating.
 2019-09-03 17:01:49 +02:00
montlikadani
d62349badc Fixed issue when used the enchanted books, then can't enchanted properly 
- Added argument for signUpdate command
- Removed hack for removing items from inventory when in browse GUI
- Version up for player gliding, because not exists in the API
 2019-08-28 18:20:27 +02:00
montlikadani
d84b7d4f03 Implement more API event methods to PrePaymentEvent 2019-08-23 17:28:35 +02:00
montlikadani
a07cbb246d Should need to get actionbar message if the exp, points or money 0 
The player should receive the payment message if one, such as points, money, or exp 0 is received. If the value 0 will not get any message.
 2019-08-23 17:09:15 +02:00
Yiğit Duman
ee85da3761 Fix for showing messages without payment (#513) 2019-08-23 15:36:54 +02:00
montlikadani
88c6d1fc38 Re-worked the quest list to support crowdin 
- Fixed %titlename% placeholder does not showed anything
- Re-added Cat, Cat is ALIVE!!
 2019-08-19 18:31:29 +02:00
montlikadani
c5d967a2f1 Some changes in commands due to duplicate values 2019-08-17 08:59:26 +02:00
Zrips
75d41356d1 Maps can't be null here... Clear action is more then enough. 2019-08-16 17:12:15 +03:00
Zrips
cb1583790c Id's should not repeat 2019-08-16 16:58:45 +03:00
Zrips
d801dd43ea Cat is not a real thing. 2019-08-16 16:53:10 +03:00
Zrips
7d06f5ad63 This should be enabled by default, doest run schedule if its empty. 2019-08-16 16:47:31 +03:00
Zrips
feed9d036f Only one scheduler is needed here 2019-08-16 16:44:42 +03:00
Zrips
229be42d64 Lets save block protection in 100's batches whatever it reaches this 
limit, instead of doing everything in one go on server shutdown
 2019-08-16 14:22:39 +03:00
Zrips
b1d457d2d6 Fix for issue with heads updates 2019-08-16 14:21:27 +03:00
montlikadani
e7b5d6ceee Forgot to remove drink from files 2019-08-15 16:30:59 +02:00
montlikadani
3ee52815a1 Remove bossbar on server shutdown 2019-08-15 09:41:25 +02:00
montlikadani
c164678273 Should fixed issue when the bars are not loaded correctly 
This caused the WeakHashMap automatically removing.
 2019-08-15 09:17:50 +02:00
montlikadani
f4ed34a00a Drink is not a job action in the whole world 2019-08-15 08:57:42 +02:00
montlikadani
611384922e Important changes for the latest MythicMobs 2019-08-14 19:18:57 +02:00
montlikadani
a4b2b4e6b5 Same changes for giving items 2019-08-14 16:06:44 +02:00
Zrips
a2668474f4 Lets hard limit block protection save to 30 days max 2019-08-14 17:00:55 +03:00
Zrips
75d80d0582 We need this... 2019-08-14 15:25:31 +03:00
Zrips
91da45d6cf Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-08-14 15:23:03 +03:00
Zrips
f7936dafb7 Lets compact sign save file 
Lets save player data if he finished quest
New questtoplist as a sign variable to show top list by quests done on
signs
 2019-08-14 15:20:58 +03:00
montlikadani
d1417cc35a Some null checks in playerManager 2019-08-14 14:13:15 +02:00
montlikadani
355074dffd We don't need the x, y, z methods, it can be get from location 2019-08-14 14:09:32 +02:00
Zrips
1b9217393f Better jobs top sign handling 2019-08-14 14:52:17 +03:00
montlikadani
0620cc6965 Signs should work now in older versions 2019-08-13 11:19:15 +02:00
montlikadani
95dda60088 Critical bug fix for fastpayment in for-loop 
- Changed the navy and silver to light_blue and light_gray due to version problems, #501
 2019-08-12 14:04:15 +02:00
montlikadani
a569f84a73 Resetquest now fully reseting the quest 
This is because so many users wanted this command to not only restore time, but the entire completed and completed quest.
 2019-08-11 14:36:43 +02:00
montlikadani
3a23f8be31 Implement placeholder for level loss message 2019-08-08 16:32:45 +02:00
montlikadani
13432fe35f Implement some missing codes 
Fixed issue when added the schedules to list but cleared in for-loop.
 2019-08-04 13:08:47 +02:00
montlikadani
0cef1e8dfd Confirmation for leave commands should work 2019-08-01 15:10:36 +02:00
montlikadani
d4a2add86e Can't call commit when autocommit=true 
Should fix SQLException when player limit saved
 2019-08-01 12:51:04 +02:00
montlikadani
0abdf99c85 Class register should be in the main thread 2019-07-28 12:39:31 +02:00
montlikadani
030e6b2890 Should fix money dupping issue when interacted block but denied, #487 2019-07-26 09:43:04 +02:00
montlikadani
01898220cc Implement some entity ids 2019-07-24 15:10:10 +02:00
montlikadani
233654daf3 Added option to hide the action names in GUI browse 2019-07-24 09:29:24 +02:00
montlikadani
cf44caa2aa Implement code to unregister all listeners on reload 
This reduces the memory leak issue sometimes
- Schedule file now generated when option is enabled in configuration
- Make sure MyPet is enabled when starting plugin
 2019-07-23 21:32:32 +02:00
montlikadani
bc97d2aaf6 No need to double check job if null 2019-07-21 17:57:16 +02:00
montlikadani
45d580342e For SQL the truncate is valid command 
- Supports 1.14.4
 2019-07-20 12:17:21 +02:00
Zrips
c188ec8658 Updating default dynamic payment equatin and some extra comments 2019-07-20 12:53:20 +03:00
montlikadani
466ad912f1 Forgot to add new action to messages 
https://github.com/Zrips/Jobs/issues/484#issuecomment-512759409
 2019-07-18 12:41:07 +02:00
montlikadani
9ed6ed59ee Implement new actiontype: Collect, #484 
To collect sweet berries from bush, and collect from composter
 2019-07-18 09:58:09 +02:00
montlikadani
deba8e6f45 Added option to quests to prevent quest progress increase in restricted area 
https://github.com/Zrips/Jobs/issues/166#issuecomment-511266927
 2019-07-17 21:31:19 +02:00
montlikadani
80ab006084 Added Cat as entity, #480 2019-07-17 12:21:23 +02:00
montlikadani
fb392c0cd1 Fix incorrect entity max health 
Monster damage option will work again when using the Kill action for jobs.
https://github.com/Zrips/Jobs/issues/429#issuecomment-511219013
 2019-07-14 19:30:27 +02:00
montlikadani
3cc2c97ec8 Added option to disable the ScheduleManager to prevent memory leak issue 
By default this has been disabled, because the plugin automatically creates the task, when we don't want to make boosts with scheduleManager.
 2019-07-14 14:45:10 +02:00
montlikadani
1f85c13335 Fixed issue when converted the database and the "truncate" is removed in latest sqlite 
- Also fixed issue when converted then the player data not show to player
 2019-07-12 18:29:00 +02:00
montlikadani
34dcb3d41a Jobs placeholders list now modifiable the page row 
- Fixed issue when used the jobs top clear scoreboard then not removed the scoreboard
- Jobs top help info message now executed when the job is specified
- Now if the MySQL settings (account) is incorrect then not send "creating table..."
 2019-07-12 17:46:25 +02:00
montlikadani
9d46a689e2 Anyway, without job placeholders not work... 2019-07-11 10:41:58 +02:00
montlikadani
6225848693 Remove some not used values 
- Added placeholders to parse when the player not in at least 1 job:
  - %jobsr_user_withoutjob_level%
  - %jobsr_user_withoutjob_exp%
  - %jobsr_user_withoutjob_job%
  - %jobsr_user_withoutjob_points%
  - %jobsr_user_withoutjob_totalpoints%
  - %jobsr_user_withoutjob_archived_jobs%
- Jobs placeholders command should work from console
 2019-07-11 10:34:54 +02:00
montlikadani
812b54ffa7 Fix archived jobs are disappeared when switch server, #475 2019-07-10 12:45:02 +02:00
montlikadani
c2cefe784a Temporary level down message 
More options will be added later
 2019-07-02 14:27:06 +02:00
montlikadani
5daae998f0 Anyway, add some informations 2019-06-29 19:08:50 +02:00
montlikadani
4d3106e585 Added option to ignore the tools (items) when using durability losing option 
+ supports enchantments
 2019-06-29 19:00:18 +02:00
montlikadani
dd8a717271 Added option to save the toggled actionbar/bossbar values to a file 
- Fixed issue when the /jobs gtop clear not removed the scoreboard
- Deprecate some methods
- Fixed issue when the nearbyEntities is invalid under 1.8 (armor stand will not work in this version)
 2019-06-27 18:03:52 +02:00
montlikadani
a6b3b42da4 Generate new jobConfig file at reload when removed 
- Cod has internal ID and should work, #459
 2019-06-24 15:02:01 +02:00
montlikadani
f8519abfa1 Add some informations about deprecated values 
- Melon block should work now
- With -1 potion ids are not generated at server start
 2019-06-18 20:30:25 +02:00
Zrips
f52d235854 Quest recording for resuming after server restart or changing server 
STRIPLOGS should be included when translating words
Lets add correct daily quest count
 2019-06-17 12:44:42 +03:00
Zrips
642b1bc176 And lets include blast furnace to furnace and smoker group 2019-06-14 16:52:51 +03:00
Zrips
7f4c85a4ad Lets include Smoker into smelt event 2019-06-14 16:45:14 +03:00
Zrips
9cac1806e2 Best way to go: Make your own thing 2019-06-14 16:20:42 +03:00
Zrips
153b573040 Better way to determine enchantment 2019-06-14 12:44:12 +03:00
Zrips
e5a1e00647 Lets simplify transletable words for items 2019-06-10 15:01:37 +03:00
montlikadani
3b42627cb8 Added firework shoot when leveling up 
- Fixed NPE when entered /jobs playerinfo command, #456
 2019-06-08 18:27:23 +02:00
Draycia
6c18f482d0
Set job in JobsPrePaymentEvent 2019-06-05 04:19:55 -07:00
Draycia
d4543c341e
Relocate JobsPrePaymentEvent import 2019-06-05 00:50:42 -07:00
Draycia
22f4cc7fa6
Add JobsPrePaymentEvent 
Add event to allow plugins to modify payments per player and per job before they're added to the delayed payment batch.
 2019-06-05 00:46:50 -07:00
montlikadani
6f082c7ca9 Added option to disable payment if player riding, #437 2019-06-04 19:13:07 +02:00
montlikadani
875f2a0b3b Let's add short digit numbers, #442 
This should fix the issue, when the placeholder used in example on scoreboard, but the double return number does not shorted to digit numbers
 2019-06-03 16:41:02 +02:00
montlikadani
5a651d3cc7 Sign char limit is 16, #443 
We do not need to short the player name to 8 character to look nicely on sign, for now if the name reach 15+ chars then write "~" after the name to short
 2019-06-01 23:40:55 +02:00
montlikadani
00393ea4c2 Changes in enchantments 
- Removed the broadcast skill ups levels, this already exist on level up
- Removed enchantments from jobConfig due to prevent console errors, that some users don't know what is, because not read it (If you want to add enchantments just find and add it, that compatible with your client version)
- Now the enchanted names are generated successfully when plugin starts, for now the 1.13+ enchantments names are not the shorted names, such as durability, instead the fully name, suc as unbreaking (durability and other shorted names, are used in only 1.12 and under)
 2019-06-01 13:28:38 +02:00
montlikadani
2a93f1b461 Fix money dupping issue (not full) 
Related issue: #438
 2019-05-30 20:03:09 +02:00
montlikadani
23e349bd10 Check for null if possible 
- Fix NPE when a item not found in enchant_table
- Melon can be used for now as melon_block
- We needs the redstone_lamp_on material, #440
 2019-05-30 18:40:41 +02:00
Zrips
1db6723904 Some extra examples of new quest system with default quests for all jobs 2019-05-27 12:11:55 +03:00
Zrips
03c18a98a1 Actual multi-objective quest thingy 2019-05-27 11:46:09 +03:00
Zrips
f870e7f5dd Lets inform when we cant recognize enchant name for enchanter 
Lets fix enchant name translation
 2019-05-26 19:29:09 +03:00
Zrips
be0bb1ef15 Fixing McMMO issue 2019-05-26 12:36:00 +03:00
Zrips
671f4ff15a Permission nodes should be for OP by default 2019-05-26 11:49:03 +03:00
Zrips
efad176d17 We have to convert slab type into String 2019-05-26 11:22:20 +03:00
Zrips
7cbdf51713 Lets catch MythicMob exception for issue with new API. Further update is 
needed
 2019-05-26 10:59:32 +03:00
montlikadani
75b1ab8e0a Fixed NPE, when break a block and checks air in hand instead of item, #427 
- Lets try to ignore recently updated deprecated methods
 2019-05-20 16:38:16 +02:00
montlikadani
59f013ba36 Stability improvements in events to reduce ram usage, #425 
- Minimize sign saving
 2019-05-19 17:41:01 +02:00
montlikadani
10d74e9593 Now works the turtle breed and other egg, #354 
- Update spigot to 1.14.1
- Remove not-used deprecated method
 2019-05-16 18:56:10 +02:00
montlikadani
ee94189989 Compile fix 2019-05-12 17:28:21 +02:00
montlikadani
4e47bf2f4f Fix potion consume event in 1.8 versions, #418 
The potion drink action will be removed soon. It seems some potions has 3-4 types and needs to be known what types of, but not described.
 2019-05-12 15:14:34 +02:00
montlikadani
1b818f5d05 Added confirmation timer to leave and leaveall, #386 
This not tested
 2019-05-09 18:31:49 +02:00
montlikadani
afb07a69d4 #413 Now checks the papi version when using old version and update to latest 
- Last commit fix for offlineplayer, we not using this
 2019-05-08 12:56:28 +02:00
montlikadani
2147c270ea Lets start the papi expansion update 
This will supports the dev. version of PlaceholderAPI, not tested
 2019-05-06 19:52:09 +02:00
montlikadani
eace433f7d Lets use the NMS classes to ignore errors 2019-05-06 19:18:15 +02:00
montlikadani
02ad7df873 Fix last commit player NOT monster 
- Fix incomplete-switch argument
 2019-05-05 13:20:32 +02:00
montlikadani
c5dc27c072 Possible fix for removing the player from list 2019-05-04 14:09:25 +02:00
montlikadani
5fde6cb79c Re-add pig-zombie and minecart command 
- We not using the deprecated codes, only old versions
 2019-05-04 13:57:20 +02:00
montlikadani
197232cdfc Fixed ClassCastException when put a new sign 
- Fixed issue when a player use the [toplist] line in sign, then randomly hide from sign
 2019-05-03 16:35:23 +02:00
montlikadani
956acf8dd1 Fixed issue when the pay is not work, #409 2019-05-03 16:24:51 +02:00
Zrips
14253be043 Lets make it always in async 2019-05-02 21:00:36 +03:00
montlikadani
9d4e62da1e Fix #403 when changing the database 2019-05-02 15:30:47 +02:00
Zrips
a950fd3d47 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-05-02 16:00:56 +03:00
Zrips
6ad9b86d3b Small step for a man... 2019-05-02 15:59:22 +03:00
montlikadani
d6fe972a0e Lets fix wall banner has not the correct id 
- Code cleanup
 2019-05-02 14:52:35 +02:00
Zrips
23dee5d93e One step at a time 2019-05-02 15:35:24 +03:00
montlikadani
cd35cc75f2 Initial 1.14 support 2019-05-01 13:19:13 +02:00
montlikadani
6ee818594b Lets start update to 1.14 2019-04-28 17:00:40 +02:00
montlikadani
472112377f Jobs shop items now use enchants 
- Fix level no job error message path not found
 2019-04-25 20:47:10 +02:00
montlikadani
f9ebb0bec3 Lets use the enum constant name not only the constant 2019-04-18 17:54:42 +02:00
montlikadani
23b834a7e0 Code cleanup 
- Last commit fix for creates a new shopItems file and show the first problem in console
- Example comment in GUI section to use custom player head
 2019-04-12 15:23:58 +02:00
montlikadani
aecfbf8419 ShopItems now in material names, not id and data 2019-04-06 14:29:59 +02:00
montlikadani
ce678030f6
Merge pull request #336 from Madis0/patch-2 
et: Limited items and more
 2019-04-04 19:59:58 +02:00
Madis
89b38f797d
Added new strings 2019-04-04 20:29:25 +03:00
montlikadani
bb2c50b637
Merge pull request #396 from lululand-de/master 
Fixed IndexOutOfBoundsException on signs update
 2019-04-03 16:29:47 +02:00
Thomas Worm
e957436a01 Fixed IndexOutOfBoundsException on signs update 2019-04-02 21:49:13 +02:00
montlikadani
da53f3d7aa Hotfix for get version from WG plugin.yml file 2019-03-25 17:47:13 +01:00
montlikadani
06538ed4e6 Now supports WorldGuard 7.0.0 
- Added a placeholder %jobs_user_archived_jobs% to show the archived jobs for the user.
- Fix file saving problem when removed the restricted area
- /jobs area command now works
 2019-03-25 17:41:08 +01:00
montlikadani
753ecefb10 Fix NPE when a user used 1.8 versions and gliding is not valid 2019-03-22 13:32:37 +01:00
montlikadani
9436fae564 Fix exp command when contains string instead of number, continue to next step 2019-03-15 15:27:12 +01:00
montlikadani
c5935ccd6d Fix double sends no-permission message 
- Removed some unnecessary classes.
- exp command can now be used as double
 2019-03-15 14:13:55 +01:00
montlikadani
5c3c064cb5 Lets fix last PR double class check and throw error 
- Fix not showing color in the chat when used chat-format option.
 2019-03-08 09:30:57 +01:00
Josiah Jones
eb02af93b2
Update McMMOManager.java 2019-03-07 13:35:53 -06:00
Josiah Jones
2f996320e1
Remove AbilityType references causing Import error 
Removed AbilityType else statement. Added additional check in CheckmcMMO() to confirm class com.gmail.nossr50.datatypes.skills.superabilitytype exists in try.
 2019-03-07 13:35:31 -06:00
Josiah Jones
2df210d4aa
Correct Import for SuperAbilityType 2019-03-07 13:11:53 -06:00
Josiah Jones
9b2945df50
Add AbilityType and SuperAbilityType back 
Adding both AbilityType and SuperAbilityType with com.gmail.nossr50.datatypes.skills as mcMMO api requires this to call.
 2019-03-06 20:49:28 -06:00
montlikadani
5d64b67d72 Quick fix for last commit 2019-03-06 18:12:56 +01:00
montlikadani
417b6f70f9 Option to broadcast skill message when a player reach level, #171 
- Modify-chat set to default false, to ignore user-friendly posts.
- DBManager registering fix at startup, #377
 2019-03-06 17:51:35 +01:00
montlikadani
2c0451aa55 Lets fix special signs has not updated heads 
- Last commit stability fix for registering class
 2019-03-01 17:03:45 +01:00
Zrips
ef7eafee08 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2019-02-28 20:17:32 +02:00
Zrips
0cada339d8 It should be compiled against 1.8 2019-02-28 20:16:53 +02:00
montlikadani
a377ad08db Lets make more stabily to catch exceptions 2019-02-28 19:16:36 +01:00
Zrips
7d35127e6b Version increment 2019-02-28 18:22:17 +02:00
Zrips
98fe82ec5f So we have to get donequests column when reading database 2019-02-28 12:56:14 +02:00
Zrips
00f62cd58f Fix for convert command issue introduced with some of previous updates 2019-02-28 12:44:48 +02:00
Zrips
be16539425 Better way to update signs and heads 2019-02-28 12:20:06 +02:00
montlikadani
0dca69e891 Added option to config to pay exploring when player gliding 
- Now not generates the bossbar options when using 1.8 or lower versions.
 2019-02-27 19:02:00 +01:00
montlikadani
c1a4c28534
Update ConfigManager.java 2019-02-27 17:19:11 +01:00
HimaJyun
c2d86ff1dd each item SoftLimit 2019-02-27 07:31:51 +09:00
montlikadani
a7f9b0d99e Fix signs not work properly so it not updated at placing a sign, #356 2019-02-24 15:38:09 +01:00
montlikadani
78ff26d124 Fix potion recognition bug 
- /jobs editjobs now actually check for off hand.
- Some fixes in /jobs editjobs command
- Fix translatable words file generating problems for potions
- Fix NPE when enchant action was pay for item enchanting but throws exception
- MythicMobs update
 2019-02-22 19:31:57 +01:00
Zrips
8aafd9f903 Fix for tabcomplete 2019-02-19 19:14:06 +02:00
Zrips
7fbfab2c4c Lets check offhand for boosted item 2019-02-19 18:10:39 +02:00
Zrips
3de7453675 So lets use reflections when using older McMMO. What else we could do in 
this situation...
 2019-02-19 17:30:43 +02:00
montlikadani
29c353214d Added option to prevent item durability loss to pay, #8 
- Fix tab-complete overwrites the server tab-complete, so if tab-complete set to -1, then its working again.
 2019-02-16 14:51:09 +01:00
montlikadani
12b2419f88 Added option to quests to use more items in one quest 2019-02-14 17:18:11 +01:00
montlikadani
1f2219b3cb Not check for explorer by the ground, but check flying, #357 2019-02-13 20:44:29 +01:00
montlikadani
62f5718eb1 Fix file loading when the plugin/server reloaded, #353 
- Fix permission for /jobs quest & /jobs shop, #358
 2019-02-11 19:47:31 +01:00
montlikadani
523ef32acd Added a option to pay for enchanting a item from anvil, #331 2019-02-06 19:57:58 +01:00
montlikadani
cee99ce850 Added a placeholder %titlename% to display the current title name, #344 
- Fix NPE when someone removed the Jobs section from the jobConfig file and throws exception
- SelectionTool now in material name not ID
- save-on-disconnect now saving successfully
- Fix NPE when jobs items not found
- Fix jobs GUI when filled with stone not the specified
 2019-02-06 14:53:08 +01:00
jackstrosahl
82620c0d01 Update PointsData 
If addPlayer is called with multiserver compatabillity, remove a player if it already exists to load from db.
Make all addPlayer functions call up to one function.
 2019-02-06 01:46:31 -06:00
Zrips
6753f24876 Version increment and minor fix for RawMessage display 2019-02-04 13:07:07 +02:00
Zrips
dd60cecb9f Lets use RawMessage builder 2019-02-04 13:02:14 +02:00
Zrips
46c2406ced Different aproach to old item boost conversion 
Lets show itembonus even if you are not in that job
 2019-02-04 12:27:53 +02:00
montlikadani
82f5ad0fd4 New placeholders to get user points 
- /jobs employ command needs max slots check
 2019-02-02 21:11:21 +01:00
Zrips
80f43d3f47 Removing debug message 2019-02-01 15:58:15 +02:00
Zrips
c3ccf30b6d Lets update signs and heads in hard way and lets make it more optimized 2019-02-01 15:38:25 +02:00
Zrips
84681df41a Lets add option to limit boosts by levels 2019-01-31 16:47:52 +02:00
Zrips
f310ad0677 Initial update to move boosted items to its own file and change behavior 2019-01-31 15:35:53 +02:00
Zrips
3310bef5a0 Lets update enchantlist in translatable file to new format 2019-01-30 16:53:41 +02:00
Zrips
b81d5ead65 Lets not forget to copy over actual translatable files from plugin 2019-01-30 16:33:08 +02:00
Zrips
a231287131 Lets centralize creative mode payment check 2019-01-30 16:15:34 +02:00
Zrips
1d897e9d3e New job action: StripLogs 2019-01-30 16:05:46 +02:00
Zrips
95f922e151 Lets use ConfigReader 
Lets properly transition to new mysql setup format by keeping old
entries
Better checks for existing mysql tables
 2019-01-30 15:28:17 +02:00
Zrips
c341d43892 Lets properly update missing and newly added quests with /jobs reload 2019-01-30 11:28:17 +02:00
Zrips
af4d6ce282 McMMO 2.1.2 support with backwards compatibility. 2019-01-30 10:45:28 +02:00
montlikadani
1f1b9ee7a9 Support for mcMMO 2.0.0 2019-01-29 19:25:26 +01:00
montlikadani
92564ee8b1 Fix money dupping when someone repaired the item from anvil 
- Fix NPE when promote argument has executed and player not found
- Let's check the permission for sender not the jobs player
 2019-01-28 19:09:11 +01:00
ken-kentan
f3a9346dba fix #337 2019-01-28 13:11:52 +09:00
ken-kentan
75f6b2aabd fix legacy wall_banner id, add legacy_brewing_stand 2019-01-28 13:11:22 +09:00
Madis
dc376c4b1a
Color code 2019-01-25 21:11:52 +02:00
Madis
dc293c9382 Limited items 2019-01-25 20:37:04 +02:00
Madis
82df707c76 Merge remote-tracking branch 'upstream/master' into patch-2 2019-01-25 20:31:40 +02:00
montlikadani
a63b259711 Fix NPE when item bonus not found 
Error: https://hastebin.com/aforinojut.cs
 2019-01-24 20:42:34 +01:00
montlikadani
b230c17292 Lets catch Throwable instead of Exception when not using spigot 
- Now you can give the limited items with **/jobs give [playername] [jobname] [items/limiteditems] [jobitemname]** command to get limited items from jobConfig.
 2019-01-23 19:23:16 +01:00
Madis
cd82882cc1
Estonian consistency update 2019-01-18 13:38:25 +02:00
Madis
2b90fe6c67
English fixes 
Grammar and spelling. Not a native speaker but I hope I helped regardless.
 2019-01-16 15:01:00 +02:00
Madis
6eac7eb471
Quantity 
Apparently this is translatable too...
 2019-01-16 14:32:12 +02:00
Madis
e849ba2cf2
Fixes for Estonian 
Translation and original syntax fixes
 2019-01-16 14:12:35 +02:00
montlikadani
825486ea0d Fixed when someone bought from the jobs shop and has not points then got the item 
- level & exp command fix when the target player has not in the job and not got any message
 2019-01-15 09:46:44 +01:00
montlikadani
d3442c8fe2 Fixed when changed the database throws error 
- Now support PlaceholderAPI the latest version
- Now support MythicMobs the latest version
 2019-01-13 18:12:12 +01:00
Zrips
e2a306acb4 Commands do support list, so lets show that it does. 2019-01-13 19:09:27 +02:00
montlikadani
28f8e24465
Update JobsPaymentListener.java 2019-01-11 19:59:19 +01:00
montlikadani
85cc9b45f2 Fix SQLiteException error when changed database to SQL 
https://www.spigotmc.org/threads/jobs-reborn.50989/page-241#post-3277743
 2019-01-09 16:01:23 +01:00
Madis
43f39b10c1
Another minor fix 2019-01-09 11:21:10 +02:00
Madis
ee7a11b8e4
YAML fix 2019-01-09 11:17:54 +02:00
Madis
670485a320
Minor fix 2019-01-09 10:52:44 +02:00
Madis
8a0cf20851
Estonian update 
New strings, many wording fixes and more syntax-wise English parity.
 2019-01-09 10:41:45 +02:00
montlikadani
40cbf67bf4 Some MySQL changes 
- Lets colorize raw message
- Make configurable MySQL auto reconnect boolean
 2019-01-08 18:50:03 +01:00
meowsome
e817089c4c
Fix Typos 
Fixed a bunch of small typos I found in comments throughout this file
 2019-01-07 21:26:32 -05:00
montlikadani
2215c57791 Added player argument to /job limit command 
- Fix sheep color not work properly
 2019-01-07 18:06:02 +01:00
montlikadani
aadf514dba Fix #323 /jobs employ if target has, then checked the permission at the target 
- Now checking correctly for plants when break
 2019-01-05 19:01:27 +01:00
montlikadani
33c1bb961d Added some 1.13 blocks 
- Some command permission fixes
- Now used UTF-8 in the MySQL, #147
- Fix last commit when a player level up or skill up and broadcast
 2019-01-04 20:46:32 +01:00
Narimm
b29da9cead Add a feature that will decrease earnings at cap by a factored amount using the equation 
(100/((1/factor*percentOver*percentOver)+1)) ie a pop growth curve.
 2019-01-04 07:42:17 +10:00
Zrips
0aeb4e383b So lets do it in packets, everyone loves packets. 2019-01-01 18:12:30 +02:00
montlikadani
6709abca2f Fixed issue with colors not work, #267 2018-12-31 13:01:53 +01:00
montlikadani
432cbbbd09 Global toplist scoreboard now work on 1.13 
- Fixed if the furnace or brewingstand reassign is disabled then saved the datas to file again again...
 2018-12-30 21:22:07 +01:00
Zrips
800aab1a3b Merge branch 'master' of https://github.com/Zrips/Jobs.git 2018-12-28 17:03:27 +02:00
Zrips
46581093fc We dont need this as this should be checking by sender not by target 2018-12-28 17:03:00 +02:00
montlikadani
af54c5c513 Hotfix for running command 2018-12-27 16:29:11 +01:00
montlikadani
82d0af935d New command: /jobs level 
Suggested by: Rangewonk / SlVlR (on Discord)
 2018-12-27 16:23:56 +01:00
Zrips
64b9b35e58 Lets automatically update plugins version in plugin.yml by pom.xml 2018-12-27 16:10:11 +02:00
Zrips
7c5a03afb6 Slab type correct check when running on older versions 2018-12-27 14:02:47 +02:00
Zrips
98cd4dee23 new command to display posible placeholders 
Some complexing for similar placeholders
 2018-12-27 13:10:12 +02:00
Zrips
0849d5532d Fix for some placeholders and renaming them to be more obvious what they 
do

Extra placeholders
 2018-12-27 12:07:14 +02:00
montlikadani
2b09ae73d6 Added some PAPI placeholders 
- Fix double checked Exception throws
 2018-12-26 14:08:27 +01:00
Zrips
db0675788a Merge branch 'master' of https://github.com/Zrips/Jobs.git 2018-12-25 22:47:17 +02:00
Zrips
f7a5980a9e Lets catch exceptions on shutdown in case there is issue with that 2018-12-25 22:47:08 +02:00
montlikadani
338e3f92f4 Need code for switch types 2018-12-25 13:03:16 +01:00
Zrips
d9a48b5b97 Lets simplify it even more 
Version increment for future release
 2018-12-25 12:58:17 +02:00
Zrips
edb943be11 Initial support for built in placeholders for PlaceHolderAPI 
Couple base placeholders
 2018-12-25 12:52:38 +02:00
montlikadani
3ea901d5c4 Hot fix for creating new words file #317 2018-12-24 13:34:37 +01:00
montlikadani
4b1cbccf17
Bumped version to check for everyone, if someone below using 4.9.4 version 2018-12-23 21:20:27 +01:00
montlikadani
d41b5f7a1f Fix wrong file & folder path 
- Code clean up
 2018-12-23 17:31:05 +01:00
Zrips
2d974b2066 Lets include new mobs in default config 2018-12-23 18:22:05 +02:00
Zrips
6823891c89 Lets use UUID's 2018-12-23 18:13:34 +02:00
Zrips
b6ae3e7617 better top command pagination handling 2018-12-23 18:06:30 +02:00
Zrips
334ace8286 Lets simplify gtop pagination process 
gtop should take into consideration how many we are showing while
extracting data from database
 2018-12-23 17:55:36 +02:00
Zrips
24b1272304 Pagination for gtop command 2018-12-23 17:38:21 +02:00
Zrips
46e062d514 Merge branch 'master' of https://github.com/Zrips/Jobs.git 2018-12-23 16:26:01 +02:00
Zrips
87e5fb2935 Lets minimize output and lets record less entries for explorer 2018-12-23 16:24:58 +02:00
montlikadani
b229a0be5f Code clean up 
- Copy over all words files before updating active ones.
 2018-12-23 14:34:59 +01:00
Zrips
8629a12710 Lest check explorer fly pay by player ground position not a fly state 2018-12-23 11:53:33 +02:00
Zrips
163af81253 We have to copy over all locale files before updating active ones. 2018-12-23 11:15:54 +02:00
Zrips
0439d5eeda Lets properly resize GUI by required slots. 2018-12-23 11:03:18 +02:00
montlikadani
c9f15c8ad4 Re-added payInCreative boolean 
If a group has jobs.paycreative permission then this booelean ignores.
 2018-12-22 14:26:45 +01:00
montlikadani
dfbf7963da Code clean up 
- Updated MythicMobs to the latest version
- Fix player double checking when interacts in world
 2018-12-17 20:50:14 +01:00
montlikadani
0592c6da62 Added some new 1.14 materials 
- Added some 1.14 enchantments
- Some permission fixes
- Not check for chunk when the player not found
- Removed non-supported plant age checker
 2018-12-13 18:54:38 +01:00
sandor111
1e07fd610d
Dutch language file 
A base for a Dutch translation.
 2018-12-08 19:31:15 +01:00
montlikadani
221ef37ea3 Fix some command permissions 
- Trident material has an ID
- Removed boolean pay-in-creative from generalConfig and replaced to jobs.paycreative permission. https://www.spigotmc.org/threads/jobs-reborn.50989/page-232#post-3242807
 2018-12-07 19:41:15 +01:00
montlikadani
e52c4fa43b Fixed the plugin not disabling 
- Fix some file creation problems
- Fixed when the player has not joined a job, milk a cow and get paid, https://www.spigotmc.org/threads/jobs-reborn.50989/page-231#post-3240788
 2018-12-04 18:16:55 +01:00
montlikadani
ed0eadad69 Some code clean up 
- Fix 1 color not work (lime)
- We using the default data folder from main class
- We don't need to copy and create a lot of message file
 2018-11-25 20:09:48 +01:00
montlikadani
717b0edebe
Merge pull request #301 from Sprungente/patch-4 
Expand German Locazion
 2018-11-25 07:55:27 +01:00
Sprungente
5f377dcd86
fix 2018-11-24 19:39:53 +01:00
Sprungente
a27ac0f022
Add new Strings 2018-11-24 19:29:16 +01:00
montlikadani
6ea97d6262
Merge pull request #305 from LogGits/patch-6 
Fixed an incorrect entity name
 2018-11-24 08:53:43 +01:00
montlikadani
6a3723c645
Merge pull request #304 from LogGits/patch-5 
Removed more duplicates
 2018-11-24 08:50:44 +01:00
LogGits
cf47aeb48a
Fixed an incorrect entity name 2018-11-24 09:03:04 +10:00
LogGits
83bdb6f1a1
Removed more duplicates 2018-11-24 08:32:29 +10:00
LogGits
c708395eff
Removed duplicate experience from woodcutting 2018-11-24 06:56:24 +10:00
Sprungente
b800214272
Translate Penalty / GER Language 
and small fix and improve :D
 2018-11-23 19:24:01 +01:00
montlikadani
9e7eb97b12 Added custom head setting to the gui shop, #152 
- Fix NullPointerException, https://www.spigotmc.org/threads/jobs-reborn.50989/page-227#post-3221066
 2018-11-16 15:48:50 +01:00
Zrips
11af61064c We don't need this ones anymore. 2018-11-13 19:14:21 +02:00
montlikadani
855cea13ef Fixed IllegalArgumentException while creating a file, #293 
- Some clean up code
 2018-11-13 17:40:52 +01:00
Zrips
ee4c7ef10d This should be present 2018-11-12 18:09:00 +02:00
Zrips
6a77f4a695 Default jobConfig file update by roracle 2018-11-12 17:50:05 +02:00
Zrips
4d51308b2f Version increment 2018-11-12 17:43:50 +02:00
montlikadani
e3829d12d2 Some tab-complete fix 
- Retrieving colors
 2018-11-12 16:31:05 +01:00
Zrips
1d3b6fc73f Lets resize jobs browse GUI if jobs can't fit in current one 2018-11-12 17:17:28 +02:00
Zrips
12232cb9fa Lets check translatable word split lenghtin case its wrong 2018-11-12 14:36:44 +02:00
Zrips
ab70033fb2 Lets add some legacy blocks 2018-11-12 13:26:10 +02:00
Zrips
bd0f124031 Lets update boosts based by permission each time using info command 2018-11-12 13:10:14 +02:00
Zrips
9d8c9532c1 Empty is not empty by Mojang logic... 2018-11-12 12:49:02 +02:00
Zrips
66f2c4e743 Lets remove data value for gui filler and back button as we can use full 
names now
Set filler display name to empty field for better looks.
 2018-11-12 12:38:08 +02:00
montlikadani
a75b128630 Improved tap-complete problems 
- Fixed villager trade not working correctly.
 2018-11-09 15:01:20 +01:00
montlikadani
ac77148230 Now if the localestring is empty or not found then create a default message file 
- Now if execute the /jobs reload command then load the furnacebrewinghandling event.
- Fix language double loading when plugin startup
 2018-11-01 17:00:29 +01:00
sync667
8e07d57ad6 Fixed bug with payments task stops randomly after taxes math get 0 or > 0. One function return fix too. 2018-10-30 18:41:32 +01:00
montlikadani
0240a41665
Merge pull request #273 from Nogapra/Nogapra-patch-1 
Update Words_fr.yml
 2018-10-26 20:21:06 +02:00
Nogapra
3ebdf1b549
Update Words_fr.yml 2018-10-26 17:54:45 +02:00
montlikadani
f6c251b0be Removed last commit test (error) 
- TODO: fixing 3 colors not working correctly #267
- Now the message files, it only creates two files, a default and a specified one.
- Fixed #239 hoppers earn money when baked food. (file creating problem)
 2018-10-26 16:54:28 +02:00
Nogapra
b96a5c96ad
Update Words_fr.yml 2018-10-26 13:59:59 +02:00
Nogapra
c156755107
Update Words_fr.yml 2018-10-26 10:58:40 +02:00
montlikadani
7410d86bcc Fix #267 (again) 3 colors not work 
Fixed an issue to 3 colors not working correctly.
 2018-10-23 17:47:23 +02:00
montlikadani
32db8ef1ea Fix #267 
The potion names & the colors not working correctly.
 2018-10-22 19:16:06 +02:00
montlikadani
5b4f43b1af Fixed the points are withdraw even if inventory is full in shop. #173 
- Fix some bed recognition problem
 2018-10-22 18:11:28 +02:00
montlikadani
cbb6c534e2 Let's adding short material names #271 
- Some fixes
- Clean up some code
 2018-10-19 20:02:03 +02:00
montlikadani
5c18493fc0 Removed last commit test (error) 
- Fix some material recognition
- Fix #268 , in the command not find the player, so it not worked the command
 2018-10-17 18:10:34 +02:00
montlikadani
e518f7308d Fix #266 2018-10-16 16:59:25 +02:00
Andre_601
9716c2722b
Update messages_de.yml 2018-10-16 15:25:00 +02:00
Zrips
350743a738 Version increment and some missing files from last commit 2018-10-16 15:31:52 +03:00
Zrips
f5183b3bac Lets shorten restrictedBlocks file and use material names instead 2018-10-16 15:17:37 +03:00
Zrips
85ec42abb7 Lets print stack trace and provide better information what happen 2018-10-16 13:53:24 +03:00
Zrips
4af999b7cc NPE 2018-10-16 12:38:31 +03:00
montlikadani
9dfa9177d1 Some changes in config 
- Now if the player not joined in the job then the placeholder not showing in the chat.
- Fix NullPointerException (again...)
 2018-10-15 17:06:40 +02:00
Zrips
7307b815dc German locale fix 2018-10-15 18:01:48 +03:00
Zrips
d9d7cb628f Version increment 2018-10-15 16:46:16 +03:00
Zrips
b6589bac2f Lets prevent slab error 2018-10-15 15:51:45 +03:00
Zrips
6d239bf83d Glowing Redstone to regular one for 1.13 2018-10-15 14:01:51 +03:00
Zrips
0fb849abca Correct enchant name translation 2018-10-15 13:36:13 +03:00
Zrips
2a1663495c New command resetquest (playerName) (job) 
Lets HashMap everything for quest progresion to avoid duplications
 2018-10-15 13:20:21 +03:00
Zrips
4fdb037fe9 lets contract potion and color name lists 2018-10-14 19:42:10 +03:00
Zrips
518794e71e Lets make it short 2018-10-14 19:22:24 +03:00
Zrips
a6a02b3ef4 Lets extract item names from CMIMaterial instead of having fixed list 2018-10-14 17:57:21 +03:00
Zrips
081edff7cb Correct entity type check for 1.13+ 2018-10-14 17:17:24 +03:00
Zrips
aa84bde32d Merge branch 'master' of https://github.com/Zrips/Jobs.git 2018-10-14 17:04:49 +03:00
Zrips
e2e3bdbbda Lets keep subtype in 1.13 2018-10-14 17:02:14 +03:00
montlikadani
178c344416 Fix NullPointerExceptions 
- Some import changes
 2018-10-14 13:37:36 +02:00
Zrips
99f13e5c47 Lets update libraaries includign rawMessage one 2018-10-14 14:01:11 +03:00
Zrips
7b8fa29cd4 Cleaning up item database from duplicates 2018-10-14 13:43:42 +03:00