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

Removes unneeded smartreply test

Browse source
This commit is contained in:
Madpeter 2020-05-07 12:49:34 +01:00
parent b7821cbd31
commit 6760f18fa6
3 changed files with 17 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Core/Commands/Group/getGroupRoles.cs
View file

@ -14,20 +14,13 @@ namespace BSB.Commands.Group
{ {
if (UUID.TryParse(args[1], out _) == true) if (UUID.TryParse(args[1], out _) == true)
{ {
if (bot.GetCommandsInterface.SmartCommandReply(args[0], "Vaildate", CommandName, true) == true) if (bot.CreateAwaitEventReply("grouproles", this, args) == true)
{ {
if (bot.CreateAwaitEventReply("grouproles", this, args) == true) return true;
{
return true;
}
else
{
return Failed("Unable to await reply");
}
} }
else else
{ {
return Failed("Smart reply [ARG 1] is not vaild"); return Failed("Unable to await reply");
} }
} }
else else

21
Core/Commands/Parcel/ParcelPrimCountAvatar.cs
View file

@ -60,29 +60,22 @@ namespace BSB.Commands.CMD_Parcel
{ {
if (base.CallFunction(args) == true) if (base.CallFunction(args) == true)
{ {
if (bot.GetCommandsInterface.SmartCommandReply(args[0], "Vaildate", CommandName, true) == true) if (UUID.TryParse(args[1], out _) == true)
{ {
if (UUID.TryParse(args[1], out _) == true) int localid = bot.GetClient.Parcels.GetParcelLocalID(bot.GetClient.Network.CurrentSim, bot.GetClient.Self.SimPosition);
if (bot.CreateAwaitEventReply("parcelobjectowners", this, args) == true)
{ {
int localid = bot.GetClient.Parcels.GetParcelLocalID(bot.GetClient.Network.CurrentSim, bot.GetClient.Self.SimPosition); bot.GetClient.Parcels.RequestObjectOwners(bot.GetClient.Network.CurrentSim, localid);
if (bot.CreateAwaitEventReply("parcelobjectowners", this, args) == true) return true;
{
bot.GetClient.Parcels.RequestObjectOwners(bot.GetClient.Network.CurrentSim, localid);
return true;
}
else
{
return Failed("Unable to await reply");
}
} }
else else
{ {
return Failed("Arg 2 is not a vaild avatar"); return Failed("Unable to await reply");
} }
} }
else else
{ {
return Failed("Arg 1 is not a vaild smart target"); return Failed("Arg 2 is not a vaild avatar");
} }
} }
return false; return false;

21
Core/Commands/Parcel/ParcelPrimCountTotal.cs
View file

@ -33,29 +33,22 @@ namespace BSB.Commands.CMD_Parcel
{ {
if (base.CallFunction(args) == true) if (base.CallFunction(args) == true)
{ {
if (bot.GetCommandsInterface.SmartCommandReply(args[0], "Vaildate", CommandName, true) == true) int localid = bot.GetClient.Parcels.GetParcelLocalID(bot.GetClient.Network.CurrentSim, bot.GetClient.Self.SimPosition);
if (bot.GetClient.Network.CurrentSim.Parcels.ContainsKey(localid) == true)
{ {
int localid = bot.GetClient.Parcels.GetParcelLocalID(bot.GetClient.Network.CurrentSim, bot.GetClient.Self.SimPosition); if (bot.CreateAwaitEventReply("parcelobjectowners", this, args) == true)
if (bot.GetClient.Network.CurrentSim.Parcels.ContainsKey(localid) == true)
{ {
if (bot.CreateAwaitEventReply("parcelobjectowners", this, args) == true) bot.GetClient.Parcels.RequestObjectOwners(bot.GetClient.Network.CurrentSim, localid);
{ return true;
bot.GetClient.Parcels.RequestObjectOwners(bot.GetClient.Network.CurrentSim, localid);
return true;
}
else
{
return Failed("Unable to await reply");
}
} }
else else
{ {
return Failed("Unable to find parcel in memory, please wait and try again"); return Failed("Unable to await reply");
} }
} }
else else
{ {
return Failed("Arg 1 is not a vaild smart target"); return Failed("Unable to find parcel in memory, please wait and try again");
} }
} }
return false; return false;