From 65b28ffc62a1a8a175d388befb34d4cefcce5be2 Mon Sep 17 00:00:00 2001 From: musilto9 Date: Tue, 24 Mar 2020 13:09:52 +0100 Subject: [PATCH] fixed trigger cell --- src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java | 1 - src/main/java/ruscz/game/gameOfProd/Cells/Person.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java b/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java index b7b0f34..16fab67 100644 --- a/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java +++ b/src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java @@ -25,7 +25,6 @@ public class InteractionCell extends Cell { } public void startEvent() { - WindowOfFreeMove.setCanPersonMove(false); if (message != null) readDialogFile(message); } diff --git a/src/main/java/ruscz/game/gameOfProd/Cells/Person.java b/src/main/java/ruscz/game/gameOfProd/Cells/Person.java index e32a2e9..d549fbc 100644 --- a/src/main/java/ruscz/game/gameOfProd/Cells/Person.java +++ b/src/main/java/ruscz/game/gameOfProd/Cells/Person.java @@ -127,8 +127,8 @@ public class Person extends Cell { WindowOfFreeMove.setCanPersonMove(false); if (!isMoving) { isInEvent = true; - WindowOfFreeMove.setNextMove(WindowOfFreeMove.KEY_EVENT); map.findTriggerByXY(x,y).startEvent(); + WindowOfFreeMove.setNextMove(WindowOfFreeMove.KEY_EVENT); } } }