Fix aetherb beam being disarmed at the same time as expiring

git-svn-id: http://svn.net-core.org/repos/t-engine4@5515 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/ui/ImageList.lua

@@ -192,7 +192,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 
 	for j = self.scroll, math.min(self.scroll + self.nb_h, #self.dlist) do
 		local row = self.dlist[j]
-		for i = 1, #row do
+		if row then for i = 1, #row do
 			local item = row[i]
 
 			if item.selected then self:drawFrame(self.frame_selected, x + (i-1) * (self.tile_w + self.padding), y) end
@@ -211,7 +211,7 @@ function _M:display(x, y, nb_keyframes, screen_x, screen_y)
 			end
 			item.last_display_x = screen_x + (x - bx)
 			item.last_display_y = screen_y + (y - by)
-		end
+		end end
 		y = y + self.tile_h + self.padding
 	end
 

game/modules/tome/data/talents/spells/aether.lua

@@ -34,7 +34,7 @@ local basetrap = function(self, t, x, y, dur, add)
 			self.temporary = self.temporary - 1
 			if self.temporary <= 0 then
 				if game.level.map(self.x, self.y, engine.Map.TRAP) == self then game.level.map:remove(self.x, self.y, engine.Map.TRAP) end
-				game.level:removeEntity(self)
+				game.level:removeEntity(self, true)
 			end
 		end,
 	}