Makes objects know what inventory they're in.

@@ -313,6 +313,8 @@ function _M:onAddObject(o, inven_id, item)
 			end
 		end
 	end
+	
+	o.in_inven = {actor = self, id = inven_id}
 end
 
 --- Called upon removing an object
@@ -323,6 +325,7 @@ function _M:onRemoveObject(o, inven_id, item)
 		end
 	end
 	o.carried = nil
+	o.in_inven = nil
 end
 
 --- Called upon dropping an object

@@ -68,8 +68,9 @@ It is said the Conclave created this weapon for their warmaster during the dark
 				local Map = require "engine.Map"
 
 				-- special_on_hit doesn't know what item triggered it, so find it
-				local self, item, inven_id = who:findInAllInventoriesBy("define_as", "LONGSWORD_WINTERTIDE")
-				if not self or not who:getInven(inven_id).worn then return end
+				local self = combat.self
+				local inven_id = self and self.in_inven and self.in_inven.id
+				if not self or not inven_id or not who:getInven(inven_id).worn then return end
 
 				if who.turn_procs.wintertide_sword then return end