From e6f1298935e8554d03ea89ff526059625cffe5e0 Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Wed, 30 Aug 2023 00:15:52 +1000
Subject: [PATCH] disable incompatible ravi commands

---
 server/channelserver/handlers_cast_binary.go | 37 ++++++++++++--------
 server/channelserver/sys_language.go         |  2 ++
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go
index 390a5fc74..6652c748f 100644
--- a/server/channelserver/handlers_cast_binary.go
+++ b/server/channelserver/handlers_cast_binary.go
@@ -258,23 +258,30 @@ func parseChatCommand(s *Session, command string) {
 						}
 					case "cm", "check", "checkmultiplier", "multiplier":
 						sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandRaviMultiplier"], s.server.GetRaviMultiplier()))
-					case "sr", "sendres", "resurrection":
-						if s.server.raviente.state[28] > 0 {
-							sendServerChatMessage(s, s.server.dict["commandRaviResSuccess"])
-							s.server.raviente.state[28] = 0
+					case "sr", "sendres", "resurrection", "ss", "sendsed", "rs", "reqsed":
+						if s.server.erupeConfig.RealClientMode == _config.ZZ {
+							switch args[1] {
+							case "sr", "sendres", "resurrection":
+								if s.server.raviente.state[28] > 0 {
+									sendServerChatMessage(s, s.server.dict["commandRaviResSuccess"])
+									s.server.raviente.state[28] = 0
+								} else {
+									sendServerChatMessage(s, s.server.dict["commandRaviResError"])
+								}
+							case "ss", "sendsed":
+								sendServerChatMessage(s, s.server.dict["commandRaviSedSuccess"])
+								// Total BerRavi HP
+								HP := s.server.raviente.state[0] + s.server.raviente.state[1] + s.server.raviente.state[2] + s.server.raviente.state[3] + s.server.raviente.state[4]
+								s.server.raviente.support[1] = HP
+							case "rs", "reqsed":
+								sendServerChatMessage(s, s.server.dict["commandRaviRequest"])
+								// Total BerRavi HP
+								HP := s.server.raviente.state[0] + s.server.raviente.state[1] + s.server.raviente.state[2] + s.server.raviente.state[3] + s.server.raviente.state[4]
+								s.server.raviente.support[1] = HP + 1
+							}
 						} else {
-							sendServerChatMessage(s, s.server.dict["commandRaviResError"])
+							sendServerChatMessage(s, s.server.dict["commandRaviVersion"])
 						}
-					case "ss", "sendsed":
-						sendServerChatMessage(s, s.server.dict["commandRaviSedSuccess"])
-						// Total BerRavi HP
-						HP := s.server.raviente.state[0] + s.server.raviente.state[1] + s.server.raviente.state[2] + s.server.raviente.state[3] + s.server.raviente.state[4]
-						s.server.raviente.support[1] = HP
-					case "rs", "reqsed":
-						sendServerChatMessage(s, s.server.dict["commandRaviRequest"])
-						// Total BerRavi HP
-						HP := s.server.raviente.state[0] + s.server.raviente.state[1] + s.server.raviente.state[2] + s.server.raviente.state[3] + s.server.raviente.state[4]
-						s.server.raviente.support[1] = HP + 1
 					default:
 						sendServerChatMessage(s, s.server.dict["commandRaviError"])
 					}
diff --git a/server/channelserver/sys_language.go b/server/channelserver/sys_language.go
index 418e1cecb..dbd48cfb8 100644
--- a/server/channelserver/sys_language.go
+++ b/server/channelserver/sys_language.go
@@ -34,6 +34,7 @@ func getLangStrings(s *Server) map[string]string {
 		strings["commandRaviRequest"] = "鎮静支援を要請します"
 		strings["commandRaviError"] = "ラヴィコマンドが認識されません"
 		strings["commandRaviNoPlayers"] = "誰も大討伐に参加していません"
+		strings["commandRaviVersion"] = "This command is disabled outside of MHFZZ"
 
 		strings["ravienteBerserk"] = "<大討伐：猛狂期>が開催されました！"
 		strings["ravienteExtreme"] = "<大討伐：猛狂期【極】>が開催されました！"
@@ -85,6 +86,7 @@ func getLangStrings(s *Server) map[string]string {
 		strings["commandRaviRequest"] = "Requesting sedation support!"
 		strings["commandRaviError"] = "Raviente command not recognised!"
 		strings["commandRaviNoPlayers"] = "No one has joined the Great Slaying!"
+		strings["commandRaviVersion"] = "This command is disabled outside of MHFZZ"
 
 		strings["ravienteBerserk"] = "<Great Slaying: Berserk> is being held!"
 		strings["ravienteExtreme"] = "<Great Slaying: Extreme> is being held!"