Merge pull request #140 from webadict/commit_stream

Fixed Trigger Firing Issue

game/src/main/java/net/demilich/metastone/game/spells/trigger/TriggerManager.java

@@ -6,8 +6,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import net.demilich.metastone.game.GameContext;
-import net.demilich.metastone.game.entities.Entity;
 import net.demilich.metastone.game.events.GameEvent;
 import net.demilich.metastone.game.events.GameEventType;
 import net.demilich.metastone.game.targeting.EntityReference;
@@ -75,7 +73,7 @@ public void fireGameEvent(GameEvent event) {
 		}
 
 		for (IGameEventListener trigger : eventTriggers) {
-			if (trigger.canFireCondition(event) && hostNotOnSideBoard(event, trigger.getHostReference())) {
+			if (trigger.canFireCondition(event) && triggers.contains(trigger)) {
 				trigger.onGameEvent(event);
 			}
 
@@ -128,13 +126,4 @@ public void removeTriggersAssociatedWith(EntityReference entityReference) {
 		}
 	}
 
-	public boolean hostNotOnSideBoard(GameEvent event, EntityReference entityReference) {
-		GameContext context = event.getGameContext();
-		Entity entity = context.resolveSingleTarget(entityReference);
-		if (context.getPlayer1().getSetAsideZone().contains(entity) || context.getPlayer2().getSetAsideZone().contains(entity)) {
-			return false;
-		}
-		return true;
-	}
-
 }