From 5d2552eb97a572ff603eaf75a1387e92a8a71114 Mon Sep 17 00:00:00 2001 From: FlamingRCCars Date: Fri, 17 Jun 2022 13:36:19 -0500 Subject: [PATCH] Fixed elytra not working when enchanted --- mods/ITEMS/mcl_armor/register.lua | 2 +- mods/PLAYER/mcl_playerplus/init.lua | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mods/ITEMS/mcl_armor/register.lua b/mods/ITEMS/mcl_armor/register.lua index 6afe5e10c..a01a952b9 100644 --- a/mods/ITEMS/mcl_armor/register.lua +++ b/mods/ITEMS/mcl_armor/register.lua @@ -209,7 +209,7 @@ minetest.register_tool("mcl_armor:elytra", { _doc_items_longdesc = mcl_armor.longdesc, _doc_items_usagehelp = mcl_armor.usage, inventory_image = "mcl_armor_inv_elytra.png", - groups = {armor = 1, armor_torso = 1, mcl_armor_uses = 10, enchantability = 1}, + groups = {armor = 1,non_combat_torse = 1, armor_torso = 1, mcl_armor_uses = 10, enchantability = 1}, sounds = { _mcl_armor_equip = "mcl_armor_equip_leather", _mcl_armor_unequip = "mcl_armor_unequip_leather", diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index cda2c322c..add5da0fa 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -279,10 +279,8 @@ minetest.register_globalstep(function(dtime) local fly_node = minetest.get_node({x = fly_pos.x, y = fly_pos.y - 0.5, z = fly_pos.z}).name local elytra = mcl_playerplus.elytra[name] - elytra.active = player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra" or "mcl_armor:elytra_enchanted" - and not player:get_attach() - and (elytra.active or control.jump and player_velocity.y < -6) - and (fly_node == "air" or fly_node == "ignore") + elytra.active = player:get_inventory():get_stack("armor", 3):get_name() == "mcl_armor:elytra" and not player:get_attach() and (elytra.active or control.jump and player_velocity.y < -6) and (fly_node == "air" or fly_node == "ignore") or "mcl_armor:elytra_enchanted" and not player:get_attach() and (elytra.active or control.jump and player_velocity.y < -6) and (fly_node == "air" or fly_node == "ignore") + if elytra.active then mcl_player.player_set_animation(player, "fly")