Merge branch 'more_fixes' into 'master'

More fixes

fix

game/modules/tome/data/talents/chronomancy/spacetime-weaving.lua

@@ -100,12 +100,12 @@ newTalent{
 		if not teleported then return end
 		
 		-- Grab a random sample of timed effects
-		local eff_ids = self:effectsFilter({status="detrimental", ignore_crosstier=true}, 1)
-		local eff = self:hasEffect(eff_id)
-		if eff then
+		local eff_id = self:effectsFilter({status="detrimental", ignore_crosstier=true}, 1)
+		if next(eff_id) then
+			local eff = self:hasEffect(eff_id[1])
 			eff.dur = eff.dur - t.getReduction(self, t)
 			if eff.dur <= 0 then
-				self:removeEffect(eff_id)
+				self:removeEffect(eff_id[1])
 			end
 		end
 

game/modules/tome/data/talents/chronomancy/speed-control.lua

@@ -101,11 +101,13 @@ newTalent{
 	getReduction = function(self, t) return 100 end,
 	getDuration = function(self, t) return getExtensionModifier(self, t, math.floor(self:combatTalentLimit(t, 4, 1, 3))) end,
 	action = function(self, t)
-		self.energy.value = self.energy.value + (t.getDuration(self, t) * 1000)
-		self:setEffect(self.EFF_TIME_STOP, 1, {power=100})
-		
-		game.logSeen(self, "#STEEL_BLUE#%s has stopped time!#LAST#", self.name:capitalize())
-		game:playSoundNear(self, "talents/heal")
+		game:onTickEnd(function()
+			self.energy.value = self.energy.value + (t.getDuration(self, t) * 1000)
+			self:setEffect(self.EFF_TIME_STOP, 1, {power=100})
+			
+			game.logSeen(self, "#STEEL_BLUE#%s has stopped time!#LAST#", self.name:capitalize())
+			game:playSoundNear(self, "talents/heal")
+		end)
 		return true
 	end,
 	info = function(self, t)