rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

corrects a issue and lowers the teleport lockout

Browse source
This commit is contained in:
Madpeterz 2021-02-25 04:46:36 +00:00
parent e48de4b7f1
commit a01985bc5e
6 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -16,4 +16,7 @@ mapgen.bat
PrimMesher/
Programs/
libremetaverse-core/.gitignore
BetterSecondbot/Dockerfile
BetterSecondbot/Dockerfile
BetterSecondbot/wiki/
BetterSecondbot/debug.json
BetterSecondbot/settings.env

3
BetterSecondbot/BetterAtHome/BetterAtHome.cs
View file

@ -37,6 +37,7 @@ namespace BetterSecondbot.BetterAtHome
{
string[] bits = helpers.ParseSLurl(a);
homeRegions.Add(bits[0]);
LogFormater.Info("Added home region: " + bits[0]);
}
}
@ -289,7 +290,7 @@ namespace BetterSecondbot.BetterAtHome
return;
}
dif = helpers.UnixTimeNow() - LastTeleportEvent;
if (dif < 120)
if (dif < 45)
{
SetBetterAtHomeAction("Waiting for Teleport lockout");
return;

1
BetterSecondbot/BetterSecondbot.csproj
View file

@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<DockerfileRunEnvironmentFiles>settings.env</DockerfileRunEnvironmentFiles>
<DockerfileContext>..\..</DockerfileContext>
<MSBuildGitHashCommand>git rev-parse --short HEAD</MSBuildGitHashCommand>
<MSBuildGitHashValidate>False</MSBuildGitHashValidate>

4
BetterSecondbot/Cli.cs
View file

@ -37,6 +37,10 @@ namespace BetterSecondBot
Thread.Sleep(1500);
}
betterAtHomeService = null;
betterTracking = null;
datastorage = null;
Bot = null;
exitBot = true;
}
public void attachEventListenerObjects(JsonConfig Config, bool as_docker)

10
Core/bottypes/CommandsBot.cs
View file

@ -263,21 +263,23 @@ namespace BetterSecondBot.bottypes
message = input[0];
signing_code = input[1];
}
List<string> bits = message.Split(new[] { "|||" }, StringSplitOptions.RemoveEmptyEntries).ToList();
string outputto = "none";
List<string> bigbits = message.Split(new[] { "#|#" }, StringSplitOptions.RemoveEmptyEntries).ToList();
List<string> bits = bigbits[0].Split(new[] { "|||" }, StringSplitOptions.RemoveEmptyEntries).ToList();
if (bits.Count == 1)
{
bits.Add("");
}
if (bits.Count == 2)
if(bigbits.Count == 2)
{
bits.Add("none");
outputto = bigbits[1];
}
bool frommaster = false;
if ((avatar == true) && ((sender_uuid == master_uuid) || (SubMasters.Contains(sender_name) == true)))
{
frommaster = true;
}
CoreCommandLib(sender_uuid, frommaster, bits[0], bits[1].Split("~#~"), signing_code,bits[2]);
CoreCommandLib(sender_uuid, frommaster, bits[0], bits[1].Split("~#~", StringSplitOptions.RemoveEmptyEntries), signing_code, outputto);
}
}

17
LibreMetaverse/NetworkManager.cs
View file

@ -855,9 +855,20 @@ namespace OpenMetaverse
OnSimDisconnected(new SimDisconnectedEventArgs(CurrentSim, type));
}
}
_packetInbox.Writer.Complete();
_packetOutbox.Writer.Complete();
if (_packetInbox != null)
{
if (_packetInbox.Writer != null)
{
_packetInbox.Writer.Complete();
}
}
if (_packetOutbox != null)
{
if (_packetOutbox.Writer != null)
{
_packetOutbox.Writer.Complete();
}
}
_packetInbox = null;
_packetOutbox = null;