diff --git a/buildscripts/03_my_updates.sh b/buildscripts/03_my_updates.sh index 3d373c8..fa71d15 100755 --- a/buildscripts/03_my_updates.sh +++ b/buildscripts/03_my_updates.sh @@ -38,7 +38,7 @@ MOD_PATCH=( ) #patch names #MOD_PATCHES - all patches defined #MOD_PATCHES - first is path and all patch names are separeted by ":" #MOD_PATCHES=("mobs/water_life:poison.patch" "buildings/doors:doors_update.patch" "player/3d_armor:mob_damage.patch" "player/hbsprint:no_damage.patch" "player/hunger_ng:effects.patch") -MOD_PATCHES=("buildings/doors:doors_update.patch" "buildings/doors:doors_update54.patch" "buildings/ts_doors:ts_doors_update54.patch" "player/hbsprint:no_damage.patch" "mobs/mobs_mobkit/water_life:poison.patch" "mobs/mobs_mobkit/water_life:poison_hunger_ng.patch" "buildings/mg_villages:villages.patch" "player/fire_plus:extend_fire.patch" "mobs/mobs_mobs/advanced_npc:adv_npc_log.patch" "mobs/mobs_mobs/mg_villages_npc:bug66.patch") +MOD_PATCHES=("buildings/doors:doors_update.patch" "buildings/doors:doors_update54.patch" "buildings/ts_doors:ts_doors_update54.patch" "player/hbsprint:no_damage.patch" "mobs/mobs_mobkit/water_life:poison.patch" "mobs/mobs_mobkit/water_life:poison_hunger_ng.patch" "buildings/mg_villages:villages.patch" "player/fire_plus:extend_fire.patch" "mobs/mobs_mobs/advanced_npc:adv_npc_log.patch" "mobs/mobs_mobs/advanced_npc:bugtrade184.patch" "mobs/mobs_mobs/mg_villages_npc:bug66.patch") #"mobs/mobs_mobs/goblins:goblins_nil.patch" #MOD_PATCHES=( ) diff --git a/mods/mobs/mobs_mobs/advanced_npc/trade/trade.lua b/mods/mobs/mobs_mobs/advanced_npc/trade/trade.lua index 56b814f..6526b9b 100644 --- a/mods/mobs/mobs_mobs/advanced_npc/trade/trade.lua +++ b/mods/mobs/mobs_mobs/advanced_npc/trade/trade.lua @@ -173,7 +173,8 @@ function npc.trade.show_trade_offer_formspec(self, player, offer_type) prompt_string = " wants to sell to you" buy_sell_string = "Buy" end - + + if trade_offer.item ~= nil then local formspec = "size[8,4]".. default.gui_bg.. default.gui_bg_img.. @@ -192,6 +193,7 @@ function npc.trade.show_trade_offer_formspec(self, player, offer_type) } -- Show formspec to player minetest.show_formspec(player:get_player_name(), "advanced_npc:trade_offer", formspec) + end end