From e1d8f94d9fbf6ae85ac15af52e411248f5a3a5b6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 2 Feb 2021 10:09:27 +0100 Subject: [PATCH] update --- mods/drinks/mod.conf | 1 - mods/lib_mount/init.lua | 13 +++++++++++++ mods/mobs_monster/mod.conf | 4 ++-- mods/skinsdb/meta/character_1946.txt | 3 +++ mods/skinsdb/meta/character_1947.txt | 3 +++ mods/skinsdb/textures/character_1946.png | Bin 0 -> 8325 bytes mods/skinsdb/textures/character_1947.png | Bin 0 -> 8325 bytes 7 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 mods/skinsdb/meta/character_1946.txt create mode 100644 mods/skinsdb/meta/character_1947.txt create mode 100644 mods/skinsdb/textures/character_1946.png create mode 100644 mods/skinsdb/textures/character_1947.png diff --git a/mods/drinks/mod.conf b/mods/drinks/mod.conf index d0c47df4..78743915 100644 --- a/mods/drinks/mod.conf +++ b/mods/drinks/mod.conf @@ -3,5 +3,4 @@ depends= bucket,default,vessels,stairs description = Adds a juice press and two juice storage containers. Most fruits and several veggies can be juiced. The resulting drinks can be 'ate' to gain health, or if you are using the thirsty mod, to regain hydration. author = Nathan, Napiophelios optional_depends = hunger,thirsty,plantlife,farming_plus,crops,farming,minetest_doc_modpack,fruits,ethereal -release = 1004 title = Drinks diff --git a/mods/lib_mount/init.lua b/mods/lib_mount/init.lua index 7affee80..8f27efc7 100644 --- a/mods/lib_mount/init.lua +++ b/mods/lib_mount/init.lua @@ -212,6 +212,19 @@ end local aux_timer = 0 function lib_mount.drive(entity, dtime, is_mob, moving_anim, stand_anim, jump_height, can_fly, can_go_down, can_go_up, enable_crash) + -- Sanity checks + if entity.driver and not entity.driver:get_attach() then entity.driver = nil end + + if entity.passenger and not entity.passenger:get_attach() then + entity.passenger = nil + end + if entity.passenger2 and not entity.passenger2:get_attach() then + entity.passenger2 = nil + end + if entity.passenger3 and not entity.passenger3:get_attach() then + entity.passenger3 = nil + end + aux_timer = aux_timer + dtime if can_fly and can_fly == true then diff --git a/mods/mobs_monster/mod.conf b/mods/mobs_monster/mod.conf index f072a868..7979671c 100644 --- a/mods/mobs_monster/mod.conf +++ b/mods/mobs_monster/mod.conf @@ -1,4 +1,4 @@ name = mobs_monster depends = default, mobs -optional depends = lucky_block, toolranks, intllib -description = Adds many types of monster. +optional_depends = lucky_block, toolranks, intllib +description = Adds many types of monsters. diff --git a/mods/skinsdb/meta/character_1946.txt b/mods/skinsdb/meta/character_1946.txt new file mode 100644 index 00000000..df2beeac --- /dev/null +++ b/mods/skinsdb/meta/character_1946.txt @@ -0,0 +1,3 @@ +altair +gamer 20n +CC BY-SA 3.0 diff --git a/mods/skinsdb/meta/character_1947.txt b/mods/skinsdb/meta/character_1947.txt new file mode 100644 index 00000000..5910236f --- /dev/null +++ b/mods/skinsdb/meta/character_1947.txt @@ -0,0 +1,3 @@ +starkiller +gamer 20n +CC BY-SA 3.0 diff --git a/mods/skinsdb/textures/character_1946.png b/mods/skinsdb/textures/character_1946.png new file mode 100644 index 0000000000000000000000000000000000000000..70ab66cb9359acd4c239c394f44a63d18a60fe9e GIT binary patch literal 8325 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 ae)6ZCnXdk>1`pv<=b# literal 0 HcmV?d00001