From 61d15ddd43e8e9f6aedb415253287c62303cfc39 Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Thu, 30 Mar 2023 21:48:23 +1100
Subject: [PATCH] remove mail item workaround

---
 config.json                           |  1 -
 config/config.go                      |  1 -
 server/channelserver/handlers_mail.go | 11 ++---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/config.json b/config.json
index cd86056a3..03dca44e5 100644
--- a/config.json
+++ b/config.json
@@ -24,7 +24,6 @@
     "TournamentEvent": 0,
     "MezFesEvent": true,
     "MezFesAlt": false,
-    "DisableMailItems": true,
     "DisableTokenCheck": false,
     "QuestDebugTools": false,
     "SaveDumps": {
diff --git a/config/config.go b/config/config.go
index 61ae99d42..1e91b24b7 100644
--- a/config/config.go
+++ b/config/config.go
@@ -50,7 +50,6 @@ type DevModeOptions struct {
 	MezFesEvent         bool // MezFes status
 	MezFesAlt           bool // Swaps out Volpakkun for Tokotoko
 	DisableTokenCheck   bool // Disables checking login token exists in the DB (security risk!)
-	DisableMailItems    bool // Hack to prevent english versions of MHF from crashing
 	QuestDebugTools     bool // Enable various quest debug logs
 	SaveDumps           SaveDumpOptions
 }
diff --git a/server/channelserver/handlers_mail.go b/server/channelserver/handlers_mail.go
index 1df4711c6..7e9784ee3 100644
--- a/server/channelserver/handlers_mail.go
+++ b/server/channelserver/handlers_mail.go
@@ -326,15 +326,8 @@ func handleMsgMhfListMail(s *Session, p mhfpacket.MHFPacket) {
 			flags |= 0x04
 		}
 
-		// Workaround until EN mail items are patched
-		if s.server.erupeConfig.DevMode && s.server.erupeConfig.DevModeOptions.DisableMailItems {
-			if itemAttached {
-				flags |= 0x08
-			}
-		} else {
-			if m.AttachedItemReceived {
-				flags |= 0x08
-			}
+		if m.AttachedItemReceived {
+			flags |= 0x08
 		}
 
 		if m.IsGuildInvite {