Merge pull request #1547 from wiremod/fix/1407-garrydupe-dupefinished

Run AdvDupe_FinishPasting for normal Duplicator

Author: AbigailBuccaneer

lua/wire/client/e2descriptions.lua

@@ -795,7 +795,7 @@ E2Helper.Descriptions["toString(q:)"] = "Formats Q as a string"
 -- Selfaware
 E2Helper.Descriptions["first()"] = "Returns 1 if the expression was spawned or reset"
 E2Helper.Descriptions["duped()"] = "Returns 1 if the expression was duplicated"
-E2Helper.Descriptions["dupefinished()"] = "Returns 1 when the contraption has finished duping. (Only triggers on Adv Duplicator, not the normal duplicator)"
+E2Helper.Descriptions["dupefinished()"] = "Returns 1 when the contraption has finished duping."
 E2Helper.Descriptions["inputClk()"] = "Returns 1 if the expression was triggered by an input"
 E2Helper.Descriptions["last()"] = "Returns 1 if it is being called on the last execution of the expression gate before it is removed or reset. This execution must be requested with the runOnLast(1) command"
 E2Helper.Descriptions["removing()"] = "Returns 1 if this is the last() execution and caused by the entity being removed"

lua/wire/server/wirelib.lua

@@ -1200,3 +1200,27 @@ function WireLib.IsValidMaterial(material)
 	return material
 end
 
+if not WireLib.PatchedDuplicator then
+	WireLib.PatchedDuplicator = true
+
+	local localPos
+
+	local oldSetLocalPos = duplicator.SetLocalPos
+	function duplicator.SetLocalPos(pos, ...)
+		localPos = pos
+		return oldSetLocalPos(pos, ...)
+	end
+
+	local oldPaste = duplicator.Paste
+	function duplicator.Paste(player, entityList, constraintList, ...)
+		local result = { oldPaste(player, entityList, constraintList, ...) }
+		local createdEntities, createdConstraints = result[1], result[2]
+		local data = {
+			EntityList = entityList, ConstraintList = constraintList,
+			CreatedEntities = createdEntities, CreatedConstraints = createdConstraints,
+			Player = player, HitPos = localPos,
+		}
+		hook.Run("AdvDupe_FinishPasting", {data}, 1)
+		return unpack(result)
+	end
+end