From f85f990e3ecf15fdb02f7809211e1c1985b1d1fc Mon Sep 17 00:00:00 2001
From: Playtester <3785983+Playtester@users.noreply.github.com>
Date: Sat, 16 Mar 2024 14:42:45 +0100
Subject: [PATCH] Fixed all status changes overwriting OPT1 status changes
 (#8172)

- Fixes #8128
---
 src/map/status.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/map/status.cpp b/src/map/status.cpp
index 632c5b272b..ee1824e368 100644
--- a/src/map/status.cpp
+++ b/src/map/status.cpp
@@ -12898,7 +12898,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 	if (battle_config.sc_castcancel&bl->type && scdb->flag[SCF_STOPCASTING])
 		unit_skillcastcancel(bl,0);
 
-	sc->opt1 = scdb->opt1;
+	if(scdb->opt1 != OPT1_NONE) sc->opt1 = scdb->opt1;
 	sc->opt2 |= scdb->opt2;
 	sc->opt3 |= scdb->opt3;
 	sc->option |= scdb->look;