same for inworld kicks

This commit is contained in:
UbitUmarov
2020-11-09 23:30:58 +00:00
parent cb1faeec04
commit 99f5787878

View File

@@ -276,6 +276,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
{
if(sp.IsDeleted || sp.IsChildAgent)
return;
if (sp.IsNPC)
{
INPCModule npcmodule = sp.Scene.RequestModuleInterface<INPCModule>();
if (npcmodule != null)
{
npcmodule.DeleteNPC(sp.UUID, sp.Scene);
return;
}
}
sp.ControllingClient.Kick(reason);
sp.Scene.CloseAgent(sp.UUID, true);
}
@@ -311,6 +320,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
return;
}
if (sp.IsNPC)
{
INPCModule npcmodule = sp.Scene.RequestModuleInterface<INPCModule>();
if (npcmodule != null)
{
npcmodule.DeleteNPC(sp.UUID, sp.Scene);
return;
}
}
sp.ControllingClient.Kick(reason);
sp.Scene.CloseAgent(sp.UUID, true);
}