Skip to content

Commit 9662667

Browse files
committed
修复:宵禁2.2.0 /gn hm和/gn time指令冲突问题
1 parent 74a6fd6 commit 9662667

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

GoodNight/Commands.cs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ public static void GnCmd(CommandArgs args)
2121
#region 列出禁止怪物表
2222
if (args.Parameters.Count == 1 && args.Parameters[0].ToLower() == "list")
2323
{
24-
if (Goodnight.Config.Npcs.Count < 1)
25-
args.Player.SendInfoMessage("当前禁止怪物生成表为空.");
26-
else
27-
args.Player.SendInfoMessage("禁止怪物生成表: " + string.Join(", ", Goodnight.Config.Npcs.Select(x => TShock.Utils.GetNPCById(x)?.FullName + "({0})".SFormat(x))));
24+
args.Player.SendInfoMessage("禁止怪物生成表: " + string.Join(", ", Goodnight.Config.Npcs.Select(x => TShock.Utils.GetNPCById(x)?.FullName + "({0})".SFormat(x))));
2825
return;
2926
}
3027
#endregion
@@ -119,23 +116,23 @@ public static void GnCmd(CommandArgs args)
119116
#endregion
120117

121118
#region 修改豁免名单方法
122-
if (args.Parameters.Count >= 3 && (args.Parameters[0].ToLower() == "hm"))
119+
if (args.Parameters.Count == 3 && (args.Parameters[1].ToLower() == "hm"))
123120
{
124-
switch (args.Parameters[2])
121+
switch (args.Parameters[1].ToLower())
125122
{
126123
case "update":
127124
{
128-
string text = args.Parameters[3];
129-
if (text != null && Goodnight.Config.Add(text))
125+
string text = args.Parameters[2];
126+
if (!String.IsNullOrEmpty(text) && Goodnight.Config.Add(text))
130127
args.Player.SendMessage("成功添加玩家 " + text + " 进入豁免名单", Color.Aquamarine);
131128
else
132129
args.Player.SendMessage("该玩家已存在豁免名单中", Color.Salmon);
133130
break;
134131
}
135132
case "clear":
136133
{
137-
string text = args.Parameters[3];
138-
if (text != null && Goodnight.Config.Del(text))
134+
string text = args.Parameters[2];
135+
if (!String.IsNullOrEmpty(text) && Goodnight.Config.Del(text))
139136
{
140137
TSPlayer plr = TSPlayer.FindByNameOrID(text)[0];
141138
if (plr != null && plr.Active && plr.ConnectionAlive)

GoodNight/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ v2.2.0
1111
彻底修复Reload覆盖写入怪物ID问题
1212
给弹幕更新方法补充了权限检查
1313
加入了/gn 指令方法控制配置项
14-
目前存在问题:/gn hm 指令失效
1514
1615
v2.1.1
1716
清除无用代码,给断开玩家连接加入全检查
@@ -56,7 +55,9 @@ v2.0.0
5655
"宵禁是否断连": false,
5756
"玩家进服拦截消息": "当前为宵禁时间,无法加入游戏。",
5857
"踢出玩家断连消息": "到点了,晚安",
59-
"断连豁免玩家": [],
58+
"断连豁免玩家": [
59+
"羽学"
60+
],
6061
"禁怪少于人数(设1为关闭禁怪)": 2,
6162
"宵禁时间设置(禁怪/断连)": {
6263
"Start": "00:00:00",

0 commit comments

Comments
 (0)