From 663c2bedbb477432310da327c341cb733e893713 Mon Sep 17 00:00:00 2001 From: River River Date: Sat, 23 Apr 2022 23:17:14 +0900 Subject: [PATCH 1/2] Fix boat initialization failure --- mods/ENTITIES/mcl_boats/init.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mods/ENTITIES/mcl_boats/init.lua b/mods/ENTITIES/mcl_boats/init.lua index 3a26c1b36..c848a858e 100644 --- a/mods/ENTITIES/mcl_boats/init.lua +++ b/mods/ENTITIES/mcl_boats/init.lua @@ -166,11 +166,13 @@ function boat.on_activate(self, staticdata, dtime_s) self._last_v = self._v self._itemstring = data.itemstring - while #data.textures < 5 do - table.insert(data.textures, data.textures[1]) - end + if data.textures then + while #data.textures < 5 do + table.insert(data.textures, data.textures[1]) + end - self.object:set_properties({textures = data.textures}) + self.object:set_properties({textures = data.textures}) + end end end From b80e511caeec19ab656f08dd053045fe28adbfbf Mon Sep 17 00:00:00 2001 From: Johannes Fritz Date: Sat, 23 Apr 2022 11:52:32 -0500 Subject: [PATCH 2/2] Fix tools backwards in wieldview --- mods/ITEMS/mcl_fishing/init.lua | 2 +- .../textures/mcl_fishing_fishing_rod.png | Bin 2397 -> 6308 bytes mods/ITEMS/mcl_mobitems/init.lua | 2 +- .../mcl_mobitems_carrot_on_a_stick.png | Bin 536 -> 6393 bytes mods/PLAYER/mcl_playerplus/init.lua | 2 +- mods/PLAYER/mcl_wieldview/mod.conf | 1 + 6 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index 788e591dc..d779a2a98 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -385,7 +385,7 @@ minetest.register_tool("mcl_fishing:fishing_rod", { _doc_items_usagehelp = S("Rightclick to launch the bobber. When it sinks right-click again to reel in an item. Who knows what you're going to catch?"), groups = { tool=1, fishing_rod=1, enchantability=1 }, inventory_image = "mcl_fishing_fishing_rod.png", - wield_image = "mcl_fishing_fishing_rod.png^[transformR270", + wield_image = "mcl_fishing_fishing_rod.png^[transformFY^[transformR90", wield_scale = { x = 1.5, y = 1.5, z = 1 }, stack_max = 1, on_place = fish, diff --git a/mods/ITEMS/mcl_fishing/textures/mcl_fishing_fishing_rod.png b/mods/ITEMS/mcl_fishing/textures/mcl_fishing_fishing_rod.png index 2fbcc73445a20508c2283c2365f16e23f681663f..d1cd9dd0308ea121b4aa177e45e9ca003f54e87e 100644 GIT binary patch literal 6308 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 delta 511 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0j)_yK~y+TWBmXBKLfd7SB@P66O_#m=Vkjp$kFUSBO@aNu^0rv z2An*w`oFrVHG`NCKSQ8{DM?OZN-DEp;N$0KFxHZ0xb^rs$$y4`UGVASM+VP`JjV8} zdInh?V+I8&A%<8_8=?#W8vt?v2v|6VF$M)VF+6zojzL6_n;|{Og`go|10LSG$pDHC z5Y{qsXH3h8We`>|VBq3lCTIxLysi@rg5nZTE(CzQfJ|%3~dfZunRzjWFEcD z_~qeGhA*!_f)(Nd`%hnG1f^IWPIfRKYyb#=3<=+SobmqY2T&1+7&g4`)D^}>+YW