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

correct issue with teleports not locking homebound correctly

Browse source
This commit is contained in:
Madpeter 2022-06-02 17:56:37 +01:00
parent 772d8264a8
commit 84e53eb10e
4 changed files with 42 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
BetterSecondBot.sln
View file

@ -13,12 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Items", "Project It
README.md = README.md README.md = README.md
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{554DA151-71C4-4C1D-97D5-F89F13D31299}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterSecondbot", "BetterSecondbot\BetterSecondbot.csproj", "{452CA177-FFD1-4248-93C0-09AFF1060E34}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecondBotEvents", "SecondBotEvents\SecondBotEvents.csproj", "{571AB1AF-4C74-4C37-AC5B-9B63383AC791}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecondBotEvents", "SecondBotEvents\SecondBotEvents.csproj", "{571AB1AF-4C74-4C37-AC5B-9B63383AC791}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{EB0A1951-FA28-4D7C-9550-EB0724D3612D}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{EB0A1951-FA28-4D7C-9550-EB0724D3612D}"
@ -42,60 +36,6 @@ Global
Release|x86 = Release|x86 Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|Any CPU.Build.0 = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|x64.ActiveCfg = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|x64.Build.0 = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|x86.ActiveCfg = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Debug|x86.Build.0 = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.DockerBuild|Any CPU.ActiveCfg = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.DockerBuild|Any CPU.Build.0 = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.DockerBuild|x64.ActiveCfg = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.DockerBuild|x64.Build.0 = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.DockerBuild|x86.ActiveCfg = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.DockerBuild|x86.Build.0 = Debug|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|Any CPU.ActiveCfg = Release|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|Any CPU.Build.0 = Release|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|x64.ActiveCfg = Release|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|x64.Build.0 = Release|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|x86.ActiveCfg = Release|Any CPU
{554DA151-71C4-4C1D-97D5-F89F13D31299}.Release|x86.Build.0 = Release|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|x64.ActiveCfg = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|x64.Build.0 = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|x86.ActiveCfg = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Debug|x86.Build.0 = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.DockerBuild|Any CPU.ActiveCfg = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.DockerBuild|Any CPU.Build.0 = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.DockerBuild|x64.ActiveCfg = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.DockerBuild|x64.Build.0 = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.DockerBuild|x86.ActiveCfg = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.DockerBuild|x86.Build.0 = Debug|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|Any CPU.Build.0 = Release|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|x64.ActiveCfg = Release|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|x64.Build.0 = Release|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|x86.ActiveCfg = Release|Any CPU
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859}.Release|x86.Build.0 = Release|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|x64.ActiveCfg = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|x64.Build.0 = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|x86.ActiveCfg = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Debug|x86.Build.0 = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.DockerBuild|Any CPU.ActiveCfg = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.DockerBuild|Any CPU.Build.0 = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.DockerBuild|x64.ActiveCfg = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.DockerBuild|x64.Build.0 = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.DockerBuild|x86.ActiveCfg = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.DockerBuild|x86.Build.0 = Debug|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|Any CPU.Build.0 = Release|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|x64.ActiveCfg = Release|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|x64.Build.0 = Release|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|x86.ActiveCfg = Release|Any CPU
{452CA177-FFD1-4248-93C0-09AFF1060E34}.Release|x86.Build.0 = Release|Any CPU
{571AB1AF-4C74-4C37-AC5B-9B63383AC791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {571AB1AF-4C74-4C37-AC5B-9B63383AC791}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{571AB1AF-4C74-4C37-AC5B-9B63383AC791}.Debug|Any CPU.Build.0 = Debug|Any CPU {571AB1AF-4C74-4C37-AC5B-9B63383AC791}.Debug|Any CPU.Build.0 = Debug|Any CPU
{571AB1AF-4C74-4C37-AC5B-9B63383AC791}.Debug|x64.ActiveCfg = Debug|Any CPU {571AB1AF-4C74-4C37-AC5B-9B63383AC791}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -173,9 +113,6 @@ Global
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{554DA151-71C4-4C1D-97D5-F89F13D31299} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
{BED23EA8-0E8F-4B4C-BFA4-74DFDFD05859} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
{452CA177-FFD1-4248-93C0-09AFF1060E34} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
{571AB1AF-4C74-4C37-AC5B-9B63383AC791} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027} {571AB1AF-4C74-4C37-AC5B-9B63383AC791} = {4388BA41-F3FC-4A0E-AA00-50E9ED45A027}
{19773905-4530-444E-A51D-00C210C2A807} = {EB0A1951-FA28-4D7C-9550-EB0724D3612D} {19773905-4530-444E-A51D-00C210C2A807} = {EB0A1951-FA28-4D7C-9550-EB0724D3612D}
{1E51D4CA-564A-4EF5-AD7A-5FCD4BD065D0} = {EB0A1951-FA28-4D7C-9550-EB0724D3612D} {1E51D4CA-564A-4EF5-AD7A-5FCD4BD065D0} = {EB0A1951-FA28-4D7C-9550-EB0724D3612D}

33
SecondBotEvents/Services/DataStoreService.cs
View file

@ -606,6 +606,19 @@ namespace SecondBotEvents.Services
protected void reset() protected void reset()
{
if (estateBanlist != null)
{
lock (avatarsName2Key) lock (groupMembers) lock (localChatHistory) lock (chatWindows) lock (estateBanlist)
{
clearMem();
}
return;
}
clearMem();
}
protected void clearMem()
{ {
avatarsName2Key = new Dictionary<string, UUID>(); avatarsName2Key = new Dictionary<string, UUID>();
@ -737,12 +750,24 @@ namespace SecondBotEvents.Services
{ {
break; break;
} }
localChatHistory.Add(e.FromName + ": " + e.Message); string source = "{Av}";
if (localChatHistory.Count <= myConfig.GetLocalChatHistoryLimit()) if (e.SourceType == ChatSourceType.Object)
{ {
break; source = "{Obj}";
}
else if (e.SourceType == ChatSourceType.System)
{
source = "{Sys}";
}
lock (localChatHistory)
{
localChatHistory.Add(source+ " "+e.FromName + ": " + e.Message);
if (localChatHistory.Count <= myConfig.GetLocalChatHistoryLimit())
{
break;
}
localChatHistory.RemoveAt(0);
} }
localChatHistory.RemoveAt(0);
break; break;
} }
default: default:

15
SecondBotEvents/Services/HomeboundService.cs
View file

@ -159,7 +159,8 @@ namespace SecondBotEvents.Services
} }
lastGotoAction = SecondbotHelpers.UnixTimeNow(); lastGotoAction = SecondbotHelpers.UnixTimeNow();
float dist = Vector3.Distance(new Vector3(location.x, location.y, location.z), getClient().Self.SimPosition); float dist = Vector3.Distance(new Vector3(location.x, location.y, location.z), getClient().Self.SimPosition);
if(dist < 1) closeToHome = false;
if (dist < 1)
{ {
closeToHome = true; closeToHome = true;
if (gotoPosAttemptedWalk == true) if (gotoPosAttemptedWalk == true)
@ -170,18 +171,18 @@ namespace SecondBotEvents.Services
gotoPosAttemptedTp = false; gotoPosAttemptedTp = false;
return; return;
} }
if ((gotoPosAttemptedWalk == false) && (dist < 16))
{
gotoPosAttemptedWalk = true;
getClient().Self.AutoPilotLocal(location.x, location.y, getClient().Self.SimPosition.Z);
return;
}
if (gotoPosAttemptedTp == false) if (gotoPosAttemptedTp == false)
{ {
gotoPosAttemptedTp = true; gotoPosAttemptedTp = true;
getClient().Self.Teleport(location.name, new Vector3(location.x, location.y, location.z), new Vector3(0, 0, 0)); getClient().Self.Teleport(location.name, new Vector3(location.x, location.y, location.z), new Vector3(0, 0, 0));
return; return;
} }
if(gotoPosAttemptedWalk == false)
{
gotoPosAttemptedWalk = true;
getClient().Self.AutoPilotLocal(location.x, location.y, location.z);
return;
}
getClient().Self.AutoPilotCancel(); getClient().Self.AutoPilotCancel();
gotoPosAttemptedWalk = false; gotoPosAttemptedWalk = false;
} }

9
SecondBotEvents/Services/InteractionService.cs
View file

@ -102,10 +102,7 @@ namespace SecondBotEvents.Services
} }
if (processRequest(myConfig.GetAcceptTeleports(), e.IM.FromAgentName, mode) == false) if (processRequest(myConfig.GetAcceptTeleports(), e.IM.FromAgentName, mode) == false)
{ {
if(markTeleport == true) // rejected requests
{
master.HomeboundService.markTeleport();
}
if (e.IM.Dialog != InstantMessageDialog.RequestLure) if (e.IM.Dialog != InstantMessageDialog.RequestLure)
{ {
return; return;
@ -113,6 +110,10 @@ namespace SecondBotEvents.Services
getClient().Self.TeleportLureRespond(e.IM.FromAgentID, e.IM.IMSessionID, false); getClient().Self.TeleportLureRespond(e.IM.FromAgentID, e.IM.IMSessionID, false);
return; return;
} }
if (markTeleport == true)
{
master.HomeboundService.markTeleport();
}
jsonOuput(true, mode, e.IM.FromAgentName); jsonOuput(true, mode, e.IM.FromAgentName);
if (e.IM.Dialog == InstantMessageDialog.RequestLure) if (e.IM.Dialog == InstantMessageDialog.RequestLure)
{ {