From a348909ba3cb8d274e313e9f6fff56d933c3dda9 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Tue, 6 Apr 2021 12:50:36 +0200
Subject: [PATCH] Enderdragon: Proper Egg and XP spawning

---
 mods/ENTITIES/mobs_mc/ender_dragon.lua | 16 ++++++----------
 mods/ITEMS/mcl_end/end_crystal.lua     |  3 +--
 mods/MAPGEN/mcl_structures/init.lua    |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/ender_dragon.lua b/mods/ENTITIES/mobs_mc/ender_dragon.lua
index e62b0d16b9..ddaea360f8 100644
--- a/mods/ENTITIES/mobs_mc/ender_dragon.lua
+++ b/mods/ENTITIES/mobs_mc/ender_dragon.lua
@@ -50,8 +50,8 @@ mobs:register_mob("mobs_mc:enderdragon", {
 	arrow = "mobs_mc:dragon_fireball",
 	shoot_interval = 0.5,
 	shoot_offset = -1.0,
-	xp_min = 12000,
-	xp_max = 12000,
+	xp_min = 500,
+	xp_max = 500,
 	animation = {
 		fly_speed = 8, stand_speed = 8,
 		stand_start = 0,		stand_end = 20,
@@ -59,15 +59,11 @@ mobs:register_mob("mobs_mc:enderdragon", {
 		run_start = 0,		run_end = 20,
 	},
 	ignores_nametag = true,
-	on_die = function(self, own_pos)
-		if self._egg_spawn_pos then
-			local pos = minetest.string_to_pos(self._egg_spawn_pos)
-			--if minetest.get_node(pos).buildable_to then
-				minetest.set_node(pos, {name = mobs_mc.items.dragon_egg})
-				return
-			--end
+	on_die = function(self, pos)
+		if not self._respawned then
+			mcl_experience.throw_experience(pos, 11500) -- 500 + 11500 = 12000
+			minetest.set_node(self._portal_pos and minetest.string_to_pos(self._portal_pos) or vector.add(mcl_vars.mg_end_platform_pos, vector.new(-27, 2, 0)), {name = mobs_mc.items.dragon_egg})
 		end
-		minetest.add_item(own_pos, mobs_mc.items.dragon_egg)
 	end,
 	fire_resistant = true,
 })
diff --git a/mods/ITEMS/mcl_end/end_crystal.lua b/mods/ITEMS/mcl_end/end_crystal.lua
index d089c3cdf7..8fcf67a1d6 100644
--- a/mods/ITEMS/mcl_end/end_crystal.lua
+++ b/mods/ITEMS/mcl_end/end_crystal.lua
@@ -58,8 +58,7 @@ local function spawn_crystal(pos)
 	for _, crystal in pairs(crystals) do
 		crystal_explode(crystal)
 	end
-	local dragon = minetest.add_entity(vector.add(portal_center, {x = 0, y = 10, z = 0}), "mobs_mc:enderdragon")
-	dragon:get_luaentity()._egg_spawn_pos = minetest.pos_to_string(vector.add(portal_center, {x = 0, y = 4, z = 0}))
+	minetest.add_entity(vector.add(portal_center, {x = 0, y = 10, z = 0}), "mobs_mc:enderdragon"):get_luaentity()._respawned = true
 end
 
 minetest.register_entity("mcl_end:crystal", {
diff --git a/mods/MAPGEN/mcl_structures/init.lua b/mods/MAPGEN/mcl_structures/init.lua
index 6a7f44dfbc..4294215a91 100644
--- a/mods/MAPGEN/mcl_structures/init.lua
+++ b/mods/MAPGEN/mcl_structures/init.lua
@@ -313,7 +313,7 @@ mcl_structures.generate_fossil = function(pos, rotation, pr)
 end
 
 mcl_structures.generate_end_exit_portal = function(pos, rot)
-	minetest.add_entity(vector.add(pos, vector.new(3, 11, 3)), "mobs_mc:enderdragon")
+	minetest.add_entity(vector.add(pos, vector.new(3, 11, 3)), "mobs_mc:enderdragon"):get_luaentity()._portal_pos = minetest.pos_to_string(vector.add(pos, vector.new(3, 5, 3)))
 	local path = minetest.get_modpath("mcl_structures").."/schematics/mcl_structures_end_exit_portal.mts"
 	return mcl_structures.place_schematic(pos, path, rot or "0", nil, true)
 end