3 files changed, 49 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 23519fc0c..c8914d964 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8865,6 +8865,45 @@ static void clif_specialeffect_value(struct block_list *bl, int effect_id, int n
 		clif->send(buf, packet_len(0x284), bl, SELF);
 	}
 }
+
+/// Remove special effects (ZC_REMOVE_EFFECT).
+/// 0b0d <id>.L <effect id>.L
+/// effect id:
+///     @see doc/effect_list.txt
+static void clif_removeSpecialEffect(struct block_list *bl, int effectId, enum send_target target)
+{
+#if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002
+	nullpo_retv(bl);
+
+	struct PACKET_ZC_REMOVE_EFFECT p;
+	p.packetType = 0xb0d;
+	p.aid = bl->id;
+	p.effectId = effectId;
+
+	clif->send(&p, sizeof(p), bl, target);
+
+	if (clif->isdisguised(bl)) {
+		p.aid = -bl->id;
+		clif->send(&p, sizeof(p), bl, SELF);
+	}
+#endif
+}
+
+static void clif_removeSpecialEffect_single(struct block_list *bl, int effectId, struct block_list *targetBl)
+{
+#if PACKETVER_MAIN_NUM >= 20181002 || PACKETVER_RE_NUM >= 20181002
+	nullpo_retv(bl);
+	nullpo_retv(targetBl);
+
+	struct PACKET_ZC_REMOVE_EFFECT p;
+	p.packetType = 0xb0d;
+	p.aid = bl->id;
+	p.effectId = effectId;
+
+	clif->send(&p, sizeof(p), targetBl, SELF);
+#endif
+}
+
 /**
  * Modification of clif_messagecolor to send colored messages to players to chat log only (doesn't display overhead).
  *
@@ -22435,6 +22474,8 @@ void clif_defaults(void)
 	clif->specialeffect = clif_specialeffect;
 	clif->specialeffect_single = clif_specialeffect_single;
 	clif->specialeffect_value = clif_specialeffect_value;
+	clif->removeSpecialEffect = clif_removeSpecialEffect;
+	clif->removeSpecialEffect_single = clif_removeSpecialEffect_single;
 	clif->millenniumshield = clif_millenniumshield;
 	clif->spiritcharm = clif_charm;
 	clif->charm_single = clif_charm_single;
diff --git a/src/map/clif.h b/src/map/clif.h
index 66d7b1c6c..e91f19f20 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -940,6 +940,8 @@ struct clif_interface {
 	void (*specialeffect) (struct block_list* bl, int type, enum send_target target);
 	void (*specialeffect_single) (struct block_list* bl, int type, int fd);
 	void (*specialeffect_value) (struct block_list* bl, int effect_id, int num, send_target target);
+	void (*removeSpecialEffect) (struct block_list *bl, int effectId, enum send_target target);
+	void (*removeSpecialEffect_single) (struct block_list *bl, int effectId, struct block_list *targetBl);
 	void (*millenniumshield) (struct block_list *bl, short shields );
 	void (*spiritcharm) (struct map_session_data *sd);
 	void (*charm_single) (int fd, struct map_session_data *sd);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 83f0a11e5..c3886730b 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2836,6 +2836,12 @@ struct PACKET_CZ_MEMORIALDUNGEON_COMMAND {
 	int32 command;
 } __attribute__((packed));
 
+struct PACKET_ZC_REMOVE_EFFECT {
+	int16 packetType;
+	uint32 aid;
+	uint32 effectId;
+} __attribute__((packed));
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris