Merge pull request 'Add a setting to disable swiftness effect on enchanted golden apples.' (#2636) from fix_fapples into master

Reviewed-on: MineClone2/MineClone2#2636
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>

mods/ITEMS/mcl_core/craftitems.lua

@@ -2,6 +2,8 @@
 
 local S = minetest.get_translator(minetest.get_current_modname())
 
+local enable_fapples = minetest.settings:get_bool("mcl_enable_fapples",true)
+
 --
 -- Crafting items
 --
@@ -162,8 +164,11 @@ local function eat_gapple(itemstack, placer, pointed_thing)
 		regen_duration, absorbtion_factor = 20, 4
 		mcl_potions.fire_resistance_func(placer, 1, 300)
 		mcl_potions.leaping_func(placer, 1, 300)
+		if enable_fapples then
+			mcl_potions.swiftness_func(placer, absorbtion_factor, 120)
 		end
-	mcl_potions.swiftness_func(placer, absorbtion_factor, 120)		-- TODO: Absorbtion
+	end
+	-- TODO: Absorbtion
 	mcl_potions.regeneration_func(placer, 2, regen_duration)
 	return gapple_hunger_restore(itemstack, placer, pointed_thing)
 end

settingtypes.txt

@@ -180,6 +180,9 @@ enable_real_maps (Enable Real Maps) bool true
 # Enable Bookshelf inventories
 mcl_bookshelf_inventories (Enable bookshelf inventories) bool true
 
+# Enable swiftness on enchanted golden apples
+mcl_enable_fapples (Enable swiftness on enchanted golden apples) bool true
+
 [Debugging]
 # If enabled, this will show the itemstring of an item in the description.
 mcl_item_id_debug (Item ID Debug) bool false