diff --git a/Core/Commands/Chat/say.cs b/Core/Commands/Chat/say.cs
index af210e7..efa4bbb 100644
--- a/Core/Commands/Chat/say.cs
+++ b/Core/Commands/Chat/say.cs
@@ -10,7 +10,7 @@ namespace BSB.Commands.Chat
{
public override string[] ArgTypes { get { return new[] { "Mixed","Text" }; } }
public override string[] ArgHints { get { return new[] { "Message or channel","Message" }; } }
- public override string Helpfile { get { return "Makes the bot talk via chat
Example: say|||Hello
Example: say|||12~#~Goodbye"; } }
+ public override string Helpfile { get { return "Makes the bot talk via chat
Example: say|||Hello
Example: say|||12~#~Goodbye"; } }
public override int MinArgs { get { return 1; } }
public override bool CallFunction(string[] args)
{
diff --git a/Core/Commands/Self/Help.cs b/Core/Commands/Self/Help.cs
index 0935628..7badadc 100644
--- a/Core/Commands/Self/Help.cs
+++ b/Core/Commands/Self/Help.cs
@@ -6,14 +6,42 @@ using OpenMetaverse;
namespace BSB.Commands.Self
-{
+{
public class Help : CoreCommand
{
-
- public override string Helpfile { get { return "Makes the bot turn to face [ARG 1] and point at them (if found)"; } }
+
+ public override string Helpfile { get { return "Basic list of commands"; } }
public override bool CallFunction(string[] args)
{
- if (UUID.TryParse(bot.FindAvatarName2Key(bot.OwnerName), out UUID owner) == true)
+ if (bot.getMaster_uuid != UUID.Zero)
+ {
+
+ StringBuilder sb = new StringBuilder();
+ sb.Append(bot.GetCommandsInterface.GetCommandHelp("im"));
+ sb.Append("\n\n");
+ sb.Append(bot.GetCommandsInterface.GetCommandHelp("say"));
+ sb.Append("\n\n");
+ sb.Append(bot.GetCommandsInterface.GetCommandHelp("botsit"));
+ sb.Append("\n\n");
+ sb.Append("\nType: 'morehelp' for a full list of commands");
+ sb.Replace("
", "\n");
+ bot.sendIM(bot.getMaster_uuid, sb.ToString());
+
+ return true;
+ }
+ else
+ {
+ return Failed("UUID is not vaild");
+ }
+ }
+ }
+ public class MoreHelp : CoreCommand
+ {
+
+ public override string Helpfile { get { return "A Full list of supported commands"; } }
+ public override bool CallFunction(string[] args)
+ {
+ if (bot.getMaster_uuid != UUID.Zero)
{
string reply = "";
int counter = 0;
@@ -35,7 +63,7 @@ namespace BSB.Commands.Self
}
}
- bot.sendIM(owner, reply);
+ bot.sendIM(bot.getMaster_uuid, reply);
return true;
}
diff --git a/Core/Commands/Self/sit.cs b/Core/Commands/Self/sit.cs
index a82fc6c..2533d91 100644
--- a/Core/Commands/Self/sit.cs
+++ b/Core/Commands/Self/sit.cs
@@ -11,7 +11,7 @@ namespace BSB.Commands.Self
{
public override string[] ArgTypes { get { return new[] { "Mixed" }; } }
public override string[] ArgHints { get { return new[] { "Text \"ground\" or a object UUID" }; } }
- public override string Helpfile { get { return "Makes the bot sit on the ground or on a object if it can see it"; } }
+ public override string Helpfile { get { return "Makes the bot sit on the ground or on a object if it can see it
Example: BOTSIT|||" + UUID.Zero; } }
public override int MinArgs { get { return 1; } }
public override bool CallFunction(string[] args)
{
diff --git a/Core/bottypes/DiscordBot.cs b/Core/bottypes/DiscordBot.cs
index 11a5bba..709459a 100644
--- a/Core/bottypes/DiscordBot.cs
+++ b/Core/bottypes/DiscordBot.cs
@@ -239,7 +239,11 @@ namespace BSB.bottypes
public override void KillMePlease()
{
base.KillMePlease();
- _ = DiscordKillMePlease();
+ if(DiscordClient != null)
+ {
+ _ = DiscordKillMePlease();
+ }
+
}
protected void DiscordGetNewChannelProperies(TextChannelProperties C,string channelname,string channeltopic,string catname)