From dd8bd23d644153da44efe57db901e6b8344c9c5e Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Fri, 18 Apr 2025 19:59:06 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=83=81=E3=83=BC=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=81=8C=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=84=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/misskey-mahjong/src/engine.master.ts | 2 +-
 packages/misskey-mahjong/src/engine.player.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/misskey-mahjong/src/engine.master.ts b/packages/misskey-mahjong/src/engine.master.ts
index e480b9ea50..ea6fa07706 100644
--- a/packages/misskey-mahjong/src/engine.master.ts
+++ b/packages/misskey-mahjong/src/engine.master.ts
@@ -133,7 +133,7 @@ class StateManager {
 		const hand = this.handTileTypes[caller];
 		return Common.SHUNTU_PATTERNS.some(pattern =>
 			pattern.includes($type(tid)) &&
-			pattern.filter(t => hand.includes(t)).length >= 2);
+			pattern.filter(t => hand.includes(t) && t !== $type(tid)).length >= 2);
 	}
 
 	private withTsumoTile(tile: TileId | undefined, isRinshan: boolean): TileId {
diff --git a/packages/misskey-mahjong/src/engine.player.ts b/packages/misskey-mahjong/src/engine.player.ts
index 7b13337acf..874a83a745 100644
--- a/packages/misskey-mahjong/src/engine.player.ts
+++ b/packages/misskey-mahjong/src/engine.player.ts
@@ -247,7 +247,7 @@ export class PlayerGameEngine {
 			const canCii = !this.isMeRiichi && house === Common.prevHouse(this.myHouse) &&
 				Common.SHUNTU_PATTERNS.some(pattern =>
 					pattern.includes($type(tid)) &&
-					pattern.filter(t => this.myHandTileTypes.includes(t)).length >= 2);
+					pattern.filter(t => this.myHandTileTypes.includes(t) && t !== $type(tid)).length >= 2);
 
 			this.state.canRon = canRon ? { callee: house } : null;
 			this.state.canPon = canPon ? { callee: house } : null;