From 2f874a6aa92b4bf336096dcd254e86467a4f8b55 Mon Sep 17 00:00:00 2001
From: WEBXOSS <webxoss@gmail.com>
Date: Sat, 1 Apr 2017 20:29:13 +0800
Subject: [PATCH] fix common bugs

---
 Card.js   | 1 +
 Player.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Card.js b/Card.js
index 1d5fdb9..0a19221 100644
--- a/Card.js
+++ b/Card.js
@@ -973,6 +973,7 @@ Card.prototype.moveTo = function (zone,arg) {
 		// 此处理在块结束时执行。
 		// http://www.takaratomy.co.jp/products/wixoss/rule/rule_rulechange/151211/index.html
 		leaveFieldEvent.oldZone.cards.forEach(function (card) {
+			if (card === leaveFieldEvent.oldZone.trap) return;
 			if (card === charm) {
 				card.game.trashingCharms.push(card);
 			} else {
diff --git a/Player.js b/Player.js
index 9639943..6a9c890 100644
--- a/Player.js
+++ b/Player.js
@@ -2360,7 +2360,7 @@ Player.prototype.setTrapFromDeckTopAsyn = function(count,max) {
 };
 
 Player.prototype.getTraps = function() {
-	return this.player.signiZones.filter(function (zone) {
+	return this.signiZones.filter(function (zone) {
 		return zone.trap;
 	}).map(function (zone) {
 		return zone.trap;