From f392e23719827178878e852403d99ae997d6018f Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Tue, 8 May 2018 17:16:11 +0200
Subject: [PATCH] Implement staticdata for arrow entities

---
 mods/ITEMS/mcl_bows/arrow.lua | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/mods/ITEMS/mcl_bows/arrow.lua b/mods/ITEMS/mcl_bows/arrow.lua
index d5534d4f..019cdb4a 100644
--- a/mods/ITEMS/mcl_bows/arrow.lua
+++ b/mods/ITEMS/mcl_bows/arrow.lua
@@ -46,7 +46,6 @@ minetest.register_node("mcl_bows:arrow_box", {
 	groups = {not_in_creative_inventory=1},
 })
 
--- FIXME: Restore arrow state properly on re-loading
 -- FIXME: Arrow velocity is a bit strange. If the arrow flies VERY long, the acceleration can cause the velocity to become negative
 -- and the arrow flies backwards.
 local ARROW_ENTITY={
@@ -202,6 +201,37 @@ ARROW_ENTITY.on_step = function(self, dtime)
 	self._lastpos={x=pos.x, y=pos.y, z=pos.z}
 end
 
+ARROW_ENTITY.get_staticdata = function(self)
+	local out = {
+		lastpos = self._lastpos,
+		startpos = self._startpos,
+		damage = self._damage,
+		stuck = self._stuck,
+		stucktimer = self._stucktimer,
+	}
+	if self._shooter and self._shooter:is_player() then
+		out.shootername = self._shooter:get_player_name()
+	end
+	return minetest.serialize(out)
+end
+
+ARROW_ENTITY.on_activate = function(self, staticdata, dtime_s)
+	local data = minetest.deserialize(staticdata)
+	if data then
+		self._lastpos = data.lastpos
+		self._startpos = data.startpos
+		self._damage = data.damage
+		self._stuck = data.stuck
+		self._stucktimer = data.stucktimer
+		if data.shootername then
+			local shooter = minetest.get_player_by_name(data.shootername)
+			if shooter and shooter:is_player() then
+				self._shooter = shooter
+			end
+		end
+	end
+end
+
 minetest.register_entity("mcl_bows:arrow_entity", ARROW_ENTITY)
 
 if minetest.get_modpath("mcl_core") and minetest.get_modpath("mcl_mobitems") then