From 81ca3a6fa2833688dae2ae302be7903cc0cda4e0 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Tue, 25 May 2021 16:38:00 +0800
Subject: [PATCH] 清理电台，代理拾荒，海港贸易机gm

---
 src/actions/GmAction.lua | 14 +++++++-------
 src/csvdata              |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/actions/GmAction.lua b/src/actions/GmAction.lua
index ff45535..c17294d 100644
--- a/src/actions/GmAction.lua
+++ b/src/actions/GmAction.lua
@@ -1029,9 +1029,9 @@ end
 
 table.insert(helpDes, {"清讨伐电台", "clear_radio", "id"})
 function _M.clear_radio(role, pms)
-	local id = pms.pm1
+	local id = tonumber(pms.pm1)
 	local radioTask = role:getProperty("radioTask")
-    if id == 0 then
+    if id ~= 0 then
         radioTask[id] = nil
     else
         radioTask = {}
@@ -1044,9 +1044,9 @@ end
 
 table.insert(helpDes, {"清代理拾荒", "clear_adv_hang", "id"})
 function _M.clear_adv_hang(role, pms)
-	local id = pms.pm1
+	local id = tonumber(pms.pm1)
 	local task = role:getProperty("advHang")
-    if id == 0 then
+    if id ~= 0 then
         task[id] = nil
     else
         task = {}
@@ -1058,10 +1058,10 @@ function _M.clear_adv_hang(role, pms)
 end
 
 table.insert(helpDes, {"清海港贸易", "clear_sea", "id"})
-function _M.clear_radio(role, pms)
-	local id = pms.pm1
+function _M.clear_sea(role, pms)
+	local id = tonumber(pms.pm1)
 	local task = role:getProperty("seaport")
-    if id == 0 then
+    if id ~= 0 then
         task.collect[id] = nil
     else
         task.collect = {}
diff --git a/src/csvdata b/src/csvdata
index 7e36066..8f6460b 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 7e360667871839f748175e801bbb1ff39ba802ac
+Subproject commit 8f6460b1bc144989ece2f2caaf5c225ae434ac38
--
libgit2 0.21.2