From 24bf4dc3860ca125240dd393994672986e82fe13 Mon Sep 17 00:00:00 2001
From: shoopea <shoopea@siteop.biz>
Date: Fri, 12 Nov 2021 09:17:25 +0800
Subject: [PATCH] update delete

---
 bot.go     | 8 ++++++--
 ttd.go     | 4 ++--
 version.go | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/bot.go b/bot.go
index 6cc3856..f93dee6 100644
--- a/bot.go
+++ b/bot.go
@@ -121,8 +121,12 @@ func botDelete(m *tb.Message) {
 	if m.Sender.ID == int(bot.Config.AdminID) {
 		r := regexp.MustCompile("/delete (?P<CompanyID>[0-9]+)")
 		ID64, _ := strconv.ParseInt(r.ReplaceAllString(m.Text, "${CompanyID}"), 10, 64)
-		srv.DeleteCompany(uint8(ID64))
-		bot.SendChat(m.Chat.ID, "Deleting")
+		if _, ok := srv.Status.Companies[uint8(ID64)]; ok {
+			srv.DeleteCompany(uint8(ID64))
+			bot.SendChat(m.Chat.ID, "Deleting")
+		} else {
+			bot.SendChat(m.Chat.ID, "Company doesn't exist")
+		}
 	} else {
 		bot.SendChat(m.Chat.ID, "Not authorized to delete")
 	}
diff --git a/ttd.go b/ttd.go
index 7e0c995..21769b3 100644
--- a/ttd.go
+++ b/ttd.go
@@ -624,11 +624,11 @@ func (s *ServerTTD) ComputeClientTime() {
 }
 
 func (s *ServerTTD) DeleteCompany(id uint8) {
-	if _, ok := s.Status.Companies[id]; ok {
+	if co, ok := s.Status.Companies[id]; ok {
 		logInfoDebug("Server.DeleteCompany : deleting #%d", id)
 		px := PacketAdminRCon{
 			Packet:  Packet{PType: AdminPacketAdminRCon},
-			Command: fmt.Sprintf("reset_company %d", id),
+			Command: fmt.Sprintf("reset_company %d", co.CompanyExtlID),
 		}
 		s.Send(px.Bytes())
 		px = PacketAdminRCon{
diff --git a/version.go b/version.go
index ceb9c08..5ac0513 100644
--- a/version.go
+++ b/version.go
@@ -1,6 +1,6 @@
 // Code generated by version.sh (@generated) DO NOT EDIT.
 package main
-var githash = "0d5c94e"
-var buildstamp = "2021-11-10_07:04:16"
-var commits = "187"
-var version = "0d5c94e-b187 - 2021-11-10_07:04:16"
+var githash = "caba808"
+var buildstamp = "2021-11-12_01:17:14"
+var commits = "188"
+var version = "caba808-b188 - 2021-11-12_01:17:14"