From d498d9e35d6ba40bc057b02b220618f8703d489d Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 19 May 2013 18:39:34 +0000
Subject: [PATCH] fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@6747 51575b47-30f0-44d4-a5cc-537603b46e54
---
 game/modules/tome/data/talents/psionic/nightmare.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/game/modules/tome/data/talents/psionic/nightmare.lua b/game/modules/tome/data/talents/psionic/nightmare.lua
index 59c20c3982..5df552f55f 100644
--- a/game/modules/tome/data/talents/psionic/nightmare.lua
+++ b/game/modules/tome/data/talents/psionic/nightmare.lua
@@ -327,7 +327,10 @@ newTalent{
 		m:resolve() m:resolve(nil, true)
 		m:forceLevelup(self.level)
 		
-		game:onTickEnd(function()game.zone:addEntity(game.level, m, "actor", x, y) end)
+		game:onTickEnd(function()
+			local x, y = util.findFreeGrid(x, y, 1, true, {[Map.ACTOR]=true})
+			if x then game.zone:addEntity(game.level, m, "actor", x, y) end
+		end)
 		game.level.map:particleEmitter(x, y, 1, "generic_teleport", {rm=60, rM=130, gm=20, gM=110, bm=90, bM=130, am=70, aM=180})
 		
 		if game.party:hasMember(self) then
-- 
GitLab