Eliy21
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
11,589 Commits 87 Branches 76 Tags 156 MiB
Commit Graph

620 Commits

Author SHA1 Message Date
Sumyjkl 177cf231b6 make elytra better again 2022-08-01 20:34:56 +10:00
Sumyjkl 696cc150b4 broke elytra 2022-08-01 20:12:53 +10:00
Sumyjkl 8f4388c4c8 elytra less sensitive to landing, allows entering flight without as much downward velocity 2022-08-01 17:42:43 +10:00
cora f1915ef2f1 Fix globalstep in mcl_hunger taking a long time 2022-07-26 00:27:34 +02:00
cora 8556226cf7 Move check to the top of the function 2022-07-24 23:38:24 +02:00
cora 323a1f6e18 Fix mcl_sprint globalstep taking long 2022-07-24 12:55:37 +02:00
SumianVoice de0a78012d fix getting stuck under non-opaque blocks 2022-07-18 10:09:04 +10:00
Sumyjkl 9062a6e22e add node_head_top to check to make sure you won't clip through blocks before going out of swim / fly mode 2022-07-17 23:14:24 +10:00
Sumyjkl a41cbb7ebf added comment and removed unnecessary code 2022-07-17 22:50:22 +10:00
Sumyjkl 4738834ddd remove unecessary code 2022-07-17 22:40:33 +10:00
Sumyjkl 2e06e22d70 removed unnecessary node_above_head variable 2022-07-17 21:50:22 +10:00
Sumyjkl e4c7d575fc take no damage when swimming near roof, no ability to no-clip through roof when swimming 2022-07-17 21:46:36 +10:00
MysticTempest e3abe72522 Fix healing speed, and saturation usage again; to be more accurate. 2022-06-25 01:41:10 -05:00
MysticTempest a6e2c94028 Tweak hunger/health mechanics: 
Ensure hunger is always ticking away, and ensure that health regen
is quicker when hunger bar is full.
And, tweak saturation to partially use up hunger to heal; instead
of healing on top of hunger.
 2022-06-24 05:38:26 -05:00
Lizzy Fleckenstein f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Lizzy Fleckenstein e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
cora a1209b14a1 playerplus: fix deprc. add_player_velocity calls 2022-05-12 23:30:39 +00:00
chmodsayshello 6806ea311d code from inital PR 2022-05-08 19:57:09 +00:00
AFCMS 3ca40cd4e4 Remove 2D preview 2022-05-04 23:15:11 +00:00
NO11 5974b6f609 Merge branch 'master' into shields2 2022-03-28 12:27:57 +00:00
NO411 aeff7cf1a4 Remove offhand item on death 2022-03-22 12:48:41 +01:00
kabou 46ee5aaa59 Fix undefined luaentity crash. 
* Add nil check to get_luaentity() access.
* Cache get_luaentity() call in local var.
 2022-03-21 01:39:02 +00:00
NO411 0f8f5a41d2 Fix dependencies 2022-03-15 16:30:03 +01:00
NO411 db68c0e26b Add shield 2022-03-15 15:58:27 +01:00
1F616EMO 615a968fbb mcl_skins 2022-02-23 23:58:05 +01:00
1F616EMO 3aff1f8981 mcl_hunger 2022-02-23 23:58:05 +01:00
1F616EMO f3d0ec845c mcl_spawn 2022-02-23 23:58:05 +01:00
1F616EMO 59fe078fd7 mcl_playerplus 2022-02-23 23:58:05 +01:00
cora a9357f7380 Do not send redundant bone position and properties 2022-02-22 11:15:56 +00:00
epCode 9b881df465 Temporarily remove glitchy Elytra crash-damage 
If you fly in certain directions with this damage system, you will die. also if you speed up too fast.
 2022-01-06 21:55:01 +00:00
Lizzy Fleckenstein bfd1fd69d1
Fix potential crash when falling onto unknown node 2021-12-19 18:59:09 +01:00
iliekprogrammar 0564121183
Code style for #1890 2021-11-12 02:36:17 +08:00
Dieter44 017bf705e9 Fixing that player can regenerate health in death screen and then respawn without HP being set to maximum 2021-11-09 19:35:32 +01:00
Dieter44 e82d21040c minor changes, ipairs() replaced with pairs() 2021-11-08 19:15:56 +01:00
Dieter44 2f05388541 Add one food_tick_timer per player instead of using one for all players. 2021-11-08 15:49:05 +01:00
Dieter44 976f522b9d Combine slowFoodTickTimer and fastFoodTickTimer to a single food_tick_timer 2021-11-08 15:33:53 +01:00
Dieter44 d0d60804a3 Implemented health regeneration mechanics as described in minecraft wiki. Saturation values and different regeneration speeds now used. 2021-11-04 21:01:28 +01:00
Dieter44 d1d11f9740 Fixed debug hudbars for player saturation and exhaustion when mcl_hunger_debug=true is set in .config file 2021-11-04 20:58:54 +01:00
epCode 1c458a2e72 Add crossbows 2021-10-15 12:00:37 -07:00
Nils Dagsson Moskopp 95c4d6472b Send FOV packets only when necessary 
Before this change, about 10 to 30 FOV packets were sent from the server
to each connected client each second. This patch only sends FOV packets
when the FOV actually needs to be changed, i.e. when the player starts
or stops sprinting.
 2021-09-15 18:08:58 +02:00
NO11 5c563d6ffd Make eating particles much more MC like! 2021-08-02 12:24:34 +00:00
SmallJoker 9d9e213012 Fix some implicit hard and soft-dependencies 
These issues were found while testing minetest#8603 and are caused by relying on the undefined mod loading order
 2021-07-16 06:18:54 +04:00
epCode 960b653979 fix #1299 2021-07-12 11:50:37 -07:00
NO11 eafb1a2797 Use add_particle instead of minetest.add_particlespawner for elytra rocket particles 2021-06-12 17:23:03 +00:00
marcin-serwin cbe8583cef Merge branch 'master' into polish-translation 2021-06-02 10:14:25 +00:00
AFCMS cd33d406b2 fix many codestyle issues (functions, strings, modpaths) 2021-05-29 16:12:33 +02:00
NO11 0d619ec6a8 Make vine protect from fall damage 2021-05-28 17:26:00 +00:00
Marcin Serwin dcceafad41 Add polish translation of mcl_hunger 2021-05-25 21:55:16 +02:00
Marcin Serwin f421e07d1c Add polish translation of mcl_spawn 2021-05-25 21:51:50 +02:00
AFCMS 9e074af07f unify code style [1] 2021-05-25 12:52:25 +02:00
AFCMS 388ab6d8df fix some codestyle issues 2021-05-25 10:56:06 +02:00
AFCMS 84a800f22b fix many warnings 2021-05-22 19:58:09 +02:00
NO11 cb82e3c9c5 Make a cobweb protect from fall damage 2021-05-16 21:13:07 +00:00
jordan4ibanez ad4e86deca Fix #1726 2021-05-10 20:17:43 -04:00
Lizzy Fleckenstein a9817fea4b Merge branch 'master' into real_maps 2021-05-05 08:21:01 +02:00
Lizzy Fleckenstein f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
Lizzy Fleckenstein 1f87874870 Make it look like the player is holding the map in their hand 2021-05-02 17:03:39 +02:00
Marcin Serwin 397a05b651 Add polish translation of mcl_skins 2021-04-29 17:16:30 +02:00
Marcin Serwin 0e8c002665 Add polish translation of mcl_playerplus 2021-04-29 16:56:33 +02:00
Lizzy Fleckenstein 819d59dbe7 Use fly_into_wall damage type for elytra damage 2021-04-27 20:56:53 +02:00
Lizzy Fleckenstein dd68b79782 Merge branch 'master' into damage 2021-04-26 09:29:03 +02:00
epCode aac9d6a105 impliment crash damage for elytra 2021-04-25 15:49:15 -07:00
Lizzy Fleckenstein cab2167520 Merge branch 'master' into damage 2021-04-25 17:32:24 +02:00
Lizzy Fleckenstein 302175691a Integrate death messages 2021-04-25 16:42:38 +02:00
AFCMS 228759e49b Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-25 14:37:17 +02:00
Lizzy Fleckenstein 58d67aace6 Merge branch 'master' into damage 2021-04-25 13:29:07 +02:00
NO11 642351a1d2 Add #1553 fireworks rocket now makes particles when used for flying 2021-04-24 19:35:23 +00:00
AFCMS 414adff8fb Fix bad API documentation od mcl_death_drop 2021-04-23 13:59:37 +00:00
Lizzy Fleckenstein 62ed39bd76 Merge branch 'master' into damage 2021-04-23 13:43:00 +02:00
Lizzy Fleckenstein 50b6f03977 Integrate no fall damage in water & end portal 2021-04-23 12:34:24 +02:00
Sven792 038066f0c5 Mirrored foodbar icons to fit the right-to-left change 2021-04-23 09:52:09 +02:00
Lizzy Fleckenstein 1e7ba2b605 Merge branch 'master' into damage 2021-04-21 11:32:50 +02:00
Lizzy Fleckenstein fe5f61c747 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-21 11:31:53 +02:00
epCode 9c3fcae9e1 Fix many things with player animation and update alex 2021-04-19 13:02:12 -07:00
Lizzy Fleckenstein ca74f23094 Merge branch 'master' into damage 2021-04-19 18:58:00 +02:00
Lizzy Fleckenstein 7efc177188 Revert minecraft color set usage in mcl_books and mcl_skins GUI menus. 
(Follow-up of d8d4cb5def)
Reverts a2fcd28a3d and partially reverts f8a627915e.
 2021-04-19 15:16:59 +02:00
Lizzy Fleckenstein d9195cc520 Redesign damage modifier execution 2021-04-18 20:08:08 +02:00
Lizzy Fleckenstein d08a226a51 Integrate critical hits 2021-04-18 19:50:48 +02:00
Lizzy Fleckenstein 2827542002 Implement food poisoning damage properly~ 2021-04-18 18:49:00 +02:00
Lizzy Fleckenstein f0d7715080 Merge branch 'master' into damage 2021-04-18 14:51:45 +02:00
Lizzy Fleckenstein 5d9c3cd85b Fix #1572 2021-04-18 14:41:44 +02:00
AFCMS f967aa3d51 remove unuseful code 2021-04-18 00:10:11 +02:00
Lizzy Fleckenstein baebe3c2d2 Fix namtags being invisible 2021-04-17 20:57:12 +02:00
Lizzy Fleckenstein 205572cc69 Fix elytra code style 2021-04-17 19:34:23 +02:00
Lizzy Fleckenstein f8b54db392 Fix controls.register_on_press being called for every player in a globalstep 2021-04-17 18:55:56 +02:00
Lizzy Fleckenstein 7c7af7d664 Merge branch 'master' into damage 2021-04-17 18:39:00 +02:00
Lizzy Fleckenstein 5c928575f8 Fix #1572, server crash during login 2021-04-17 18:15:45 +02:00
Lizzy Fleckenstein d952423dda Improve wielditem performance and fix wielditems sometimes showing duplicate 2021-04-17 13:24:30 +02:00
Lizzy Fleckenstein 4d515e95c6 Remove wieldview 2021-04-17 12:58:40 +02:00
Lizzy Fleckenstein ca75a893db Merge branch 'master' into damage 2021-04-17 12:58:19 +02:00
AFCMS 5f076d372a fix many codestyle errors 2021-04-17 07:42:49 +02:00
AFCMS a602f64ea5 fix many warnings 2021-04-15 23:41:34 +02:00
AFCMS b497778192 delete unused file 2021-04-15 22:22:39 +02:00
Lizzy Fleckenstein 9c75cd1a79 Implement starve damage 2021-04-14 19:09:46 +02:00
Lizzy Fleckenstein a3af1cdf6e Implement in_wall damage type 2021-04-14 19:07:58 +02:00
Lizzy Fleckenstein 875bb3db84 Use fire-like damage types properly 2021-04-14 17:20:51 +02:00
Lizzy Fleckenstein e74838136d Use cactus damage type 2021-04-14 16:27:21 +02:00
Lizzy Fleckenstein d0ddd38d4e Merge branch 'master' into damage 2021-04-14 16:14:00 +02:00
Lizzy Fleckenstein ce0148d9a8 Rewrite armor; new damage system 2021-04-14 15:46:52 +02:00
epCode 5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07:00
epCode 8d22102c66 remove abitrary minetest.chat_send_all( 2021-04-13 16:28:38 -07:00
epCode 399ed85717 Make flying w elytra use pitch and not sneak 2021-04-13 16:14:37 -07:00
epCode f498d3ae02 make elytra activate mor MC-like 2021-04-13 11:45:31 -07:00
epCode 424685d3d3 Add elytra (sprint in air to use) 2021-04-12 14:56:33 -07:00
Lizzy Fleckenstein 523a0c54d6 Localize c_x and c_y in mcl_playerplus 2021-04-12 14:54:14 +02:00
epCode ce49cd02ac make player collision box MUCH closer to MC 2021-04-10 15:41:50 -07:00
epCode 3ff214ec2d lessen the push strength for players 2021-04-10 15:06:16 -07:00
epCode f6db31eae3 add criticle and sprint hits. 2021-04-10 14:47:26 -07:00
epCode 08b7340ff5 Fix crash with player near unknown object 2021-04-10 10:20:38 -07:00
epCode 849823af1f Add player pushing ;) 2021-04-09 14:33:14 -07:00
iliekprogrammar 61cef21cd1 Add right-to-left statbars, for hunger and air. 2021-04-07 22:26:42 +08:00
Lizzy Fleckenstein 38a12e59da Fix comment indentation in wieldview 2021-04-06 16:02:18 +02:00
Lizzy Fleckenstein 1d587b8895 Fix crash in wieldview 2021-04-06 15:59:59 +02:00
Lizzy Fleckenstein e407ad2254 Fix #1447 2021-04-05 09:25:03 +02:00
epCode 97424f7d0a Fix #1414 2021-03-30 10:24:39 -07:00
epCode a14959ac70 add player death animation and particles 2021-03-30 09:53:55 -07:00
AFCMS a040355dce Revert "Revert "Revert "improve wieldview API (!)""" 
This reverts commit d4e0d4d1c1.
 2021-03-30 01:00:51 +02:00
AFCMS d4e0d4d1c1 Revert "Revert "improve wieldview API (!)"" 
This reverts commit 613779a851.
 2021-03-30 01:00:17 +02:00
AFCMS 613779a851 Revert "improve wieldview API (!)" 
This reverts commit 600e8bede2.
 2021-03-30 00:59:00 +02:00
AFCMS 600e8bede2 improve wieldview API (!) 
to support transform registration without groups
this will make detaching screwdriver from mcl more easy
 2021-03-30 00:35:29 +02:00
AFCMS a2fcd28a3d use proper colors in mcl_skins 2021-03-29 22:23:00 +02:00
kay27 2e3a5efaf9 [mcl_spawn] Ignore 'ignore' nodes when checking the point, fix MineClone2/MineClone2#1230 2021-03-29 03:08:21 +04:00
kay27 b587b1f2a5 [mcl_spawn] Cleanup 2021-03-29 02:48:45 +04:00
AFCMS 57ce5143b9 Clarify API documentation 2021-03-27 23:39:22 +01:00
AFCMS 3ba7a40251 Add API documentation 2021-03-27 23:07:46 +01:00
AFCMS 6a6b5970b3 fix API 2021-03-27 20:23:51 +01:00
AFCMS 30e50a64ef basic API (WIP) 2021-03-27 20:12:48 +01:00
ArTee3 910c9083e5 Fix player speed on soul sand, MineClone2/MineClone2#1356 2021-03-22 21:55:57 +01:00
iliekprogrammar 12745bd450 Remove debug information... again :/ 2021-03-20 10:13:48 +08:00
iliekprogrammar 34dbddb40a Move holding code into mcl_playerplus 2021-03-20 08:42:48 +08:00
iliekprogrammar 249b5cfd1e Remove debug information 2021-03-20 00:11:12 +08:00
iliekprogrammar f5f85a2148 Slightly lift your right arm when holding an item. 2021-03-19 23:28:33 +08:00
Lizzy Fleckenstein 9391628813 Fix wielded nodes being upside down 2021-03-19 12:41:03 +01:00
Lizzy Fleckenstein f3580efced Separate Head / Body rotation (Implement #1189) 2021-03-19 11:32:17 +01:00
Lizzy Fleckenstein 4a53ba67ab Wielditem rotation tweak 2021-03-19 09:37:24 +01:00
Nicu e61f1e38f2 Rotation fix for all wielded items 
These were probably needed in an older version of the game/engine, but most items don't need changes for correct wielding. The only tweak was needed for the screwdriver.
 2021-03-18 19:31:51 +00:00
Lizzy Fleckenstein df59cc12a8 Proper bucket rotations (Fix #1289) 2021-03-18 12:48:29 +01:00
AFCMS 8f30e223e2 I hate reverting something xD 2021-03-16 17:39:06 +01:00
AFCMS c1da231f9d Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-03-15 09:37:54 +01:00
epCode 39c357672c Add cammera zoom effect while drawing bow 2021-03-14 17:13:23 -07:00
AFCMS 2dcaf8fdcb improve performances of mcl_playerplus 
really noticeable gain with caching  global functions
 2021-03-15 00:32:19 +01:00
epCode 975efb2288 Fix #1136 2021-03-13 10:35:36 -08:00
epCode 360070bb6a Fix player eye height above head 2021-03-11 15:56:09 -08:00
epCode d12009538e Better mob_mount animations (riding) 2021-03-10 12:27:42 -08:00
Lizzy Fleckenstein 31441a02e5 Add CSM sprinting with double tap forward 2021-03-05 09:26:13 +01:00
Lizzy Fleckenstein d57db0444f Use mod.conf in all mods, part 1 2021-03-04 15:22:14 +01:00
Code-Sploit 83ade6fadd Merge branch 'master' into master 2021-02-28 14:04:10 +00:00
Code-Sploit 6ab0e0fa86 Do some calculating 2021-02-28 14:02:48 +00:00
epCode 9f66238aaa Transform mcl_meshhand_female.b3d to correct rotation 2021-02-27 11:36:18 -08:00
Code-Sploit 99b5dff849 Fix another bug 2021-02-27 16:13:05 +00:00
Code-Sploit de9d838642 Fix a bug and improve some things 
Bugs:
1) When player is in liquid and takes off his/her boots, he/her still has increased speed.

Improve:
1) Check for liquid group instead of node names
 2021-02-27 16:10:11 +00:00
Code-Sploit 828c1110b1 Implement Depth Strider enchantment 2021-02-27 15:37:25 +00:00
Lizzy Fleckenstein e5263d854e Localize player_vel_yaw 2021-02-27 15:10:25 +01:00
Lizzy Fleckenstein 5a0b7bc131 Fix usages of player:get_velocity(), closes #1203 2021-02-27 15:07:10 +01:00
Lizzy Fleckenstein ba1e42a638 Remove debug chat_send_all xD 2021-02-27 14:42:39 +01:00
epCode 2b513aa592 Change mcl_meshand depending on skin metadata 2021-02-26 15:01:30 -08:00
epCode 73616453a4 Fix #1188 2021-02-25 19:01:22 -08:00
epCode 3406342ed0 remove unessesary Message every time skin is changed 2021-02-25 13:38:02 -08:00
epCode 8f2a588059 Fix #1156 2021-02-25 12:27:14 -08:00
epCode fb5f86d829 Fix #1196 2021-02-25 12:07:25 -08:00
epCode 8c1444a1a8 Fix Swim toggling 2021-02-25 12:06:24 -08:00
Lizzy Fleckenstein d4401a6c3e Simplify 3D wielded nodes (improves performance + possibly fixes a crash) 2021-02-25 17:35:44 +01:00
epCode fbb79635eb Fix player body rotation glitch 2021-02-24 17:11:00 -08:00
kay27 3ceb2b0a4d Fix MineClone2/MineClone2#1160 2021-02-25 03:30:34 +04:00
epCode c1c3dbfaec Fix #1184 2021-02-24 15:21:05 -08:00
epCode d1fd3cc827 Add 3D wieldveiw for non-item objects 2021-02-24 13:20:31 -08:00
Lizzy Fleckenstein da606fa9d2 Add 3d wielded nodes (not functional until Right_Hand bone is added) 2021-02-24 12:58:30 +01:00
epCode 4334339ba3 Fix player head bone in while attached 2021-02-23 14:18:52 -08:00
epCode 9caf6f2904 Add more MC-like player body bone positioning 2021-02-22 18:48:09 -08:00
Lizzy Fleckenstein 152d49ef20 Fix #1167 2021-02-22 10:41:44 +01:00
epCode d8b5620115 Make head block detection more stable 2021-02-21 04:11:20 +00:00
epCode 38cb2fdeec Fix swimming crash (sorry) 2021-02-20 19:19:59 -08:00
epCode 98f6e05cdc Make swimming a bit smoother 2021-02-20 16:21:09 -08:00
epCode ecb70aaf55 Make player head anim while attached more flexible 2021-02-19 14:07:36 -08:00
AFCMS 4c3954959c replace pairs() by ipairs() in mcl_player 2021-02-18 15:32:15 +00:00
AFCMS 25653e6178 replace pairs() by ipairs() in mcl_playerinfo 2021-02-18 15:31:13 +00:00
AFCMS 0531aae687 replace pairs() by ipairs() in mcl_playerplus 2021-02-18 15:27:50 +00:00
AFCMS 2e2d0b49ea performance fix in mcl_skins 2021-02-18 15:07:37 +00:00
Lizzy Fleckenstein aeb7078c05 Update use_texture_alpha to the minetest 5.4 conventions 2021-02-18 14:00:17 +01:00
epCode 18a8d011a2 Sprinting anim, MC-like Player anims, Swimming detection 2021-02-17 15:17:12 -08:00
epCode a49e144911 Localize a couple variables 2021-02-17 02:51:33 +00:00
epCode c238fd9ba7 Set swiming detection to "node_feet" 2021-02-16 14:18:06 -08:00
epCode 24c14e7f15 Fix bow having weird hand placements while hitting and loading 2021-02-16 20:13:12 +00:00
Elias Fleckenstein 98b00898a5 Merge pull request 'Make player wield switch instant' (#1129) from Code-Sploit/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#1129
 2021-02-16 12:40:55 +00:00
Code-Sploit 9cbfaf012e Make player wield switch instant 2021-02-16 12:34:26 +00:00
epCode 3b775c38cd Fix wrong numbers (Swaped) 
My bad
 2021-02-15 23:46:27 +00:00
epCode 164aad4ff9 Fix player glitches when standing by the water 
Instead of making the player collisionbox smaller from the ground, I made it smaller from the top.
 2021-02-15 16:59:24 +00:00
epCode 52c36d45da Remove Buggy Crawling for Fixing 2021-02-14 11:18:46 -08:00
epCode ba86cf1d8b Impliment crawling 2021-02-13 16:09:00 -08:00
epCode a9fe8d58e5 Add bow aiming animations 2021-02-12 09:16:08 -08:00
epCode d7cfe54eb4 Give the player some eyes 2021-02-11 12:20:39 -08:00
epCode 6a3a0362a3 Fix player looking up while on water and attached 2021-02-09 19:00:54 +00:00
Lizzy Fleckenstein 484ffc924a Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 2021-02-09 18:19:18 +01:00
Lizzy Fleckenstein b36db2044f 3D Player preview in inventory 2021-02-08 20:13:08 +01:00
kay27 bd1e4187a0 Fix MineClone2/MineClone2#1079 by epCode 2021-02-08 11:48:31 +04:00
epCode 29d43b9709 Fix player head with wrong pitch while swiming 2021-02-06 18:18:19 -08:00
epCode c5169e48a1 Merge branch 'master' of https://git.minetest.land/epCode/MineClone2 2021-02-06 17:50:27 -08:00
epCode 38f70561c5 Swiming coment 2021-02-06 17:44:30 -08:00
epCode df8bdfbc36 Animations for swiming 2021-02-06 17:40:07 -08:00
kay27 84289a3a11 Tiny code cleanup and potentially bugfix after latest mergings 2021-02-07 02:56:00 +04:00