Skip to content

Fix for Rust update (drone targeting) #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WheteThunger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for Rust update (drone targeting) #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 50 additions & 21 deletions SAMSiteAuth.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,85 @@

namespace Oxide.Plugins
{
[Info("SAMSiteAuth", "haggbart", "2.4.3")]
[Info("SAMSiteAuth", "haggbart", "2.4.4")]
[Description("Makes SAM Sites act in a similar fashion to shotgun traps and flame turrets.")]
internal class SAMSiteAuth : RustPlugin
{
private readonly object True = true;

private object OnSamSiteTarget(SamSite samSite, BaseCombatEntity target)
{
var mountPoints = (target as BaseVehicle)?.mountPoints;
if (!IsOccupied(target, mountPoints))
if (target is Drone drone)
return HandleDroneTarget(samSite, drone);

if (target is BaseVehicle vehicle)
return HandleVehicleTarget(samSite, vehicle);

return null;
}

// Mimic auto turrets, which check the auth of the drone owner (not the drone controller)
private object HandleDroneTarget(SamSite samSite, Drone drone)
{
// Don't interfere with static sam sites because players cannot be authorized to them
if (samSite.staticRespawn)
return null;

// Don't interfere with drones that have no owner (we don't know whose auth to check)
if (drone.OwnerID == 0)
return null;

// Don't interfere with sam sites that don't have a cupboard in range
var cupboard = samSite.GetBuildingPrivilege(samSite.WorldSpaceBounds());
if (cupboard is null)
return null;

// Block targeting if the drone owner is authed
if (cupboard.IsAuthed(drone.OwnerID))
return True;

// Don't interfere with targeting in this case
return null;
}

private object HandleVehicleTarget(SamSite samSite, BaseVehicle vehicle)
{
// Don't target empty vehicles (intentionally applies even to static sam sites)
var mountPoints = vehicle.mountPoints;
if (!IsOccupied(vehicle, mountPoints))
return True;

// Don't interfere with static sam sites because players cannot be authorized to them
if (samSite.staticRespawn)
return null;

// Don't interfere with sam sites that don't have a cupboard in range
var cupboard = samSite.GetBuildingPrivilege(samSite.WorldSpaceBounds());
if ((object)cupboard == null)
if (cupboard is null)
return null;

// Block targeting if any mounted player is authed
if (mountPoints != null)
{
foreach (var mountPoint in mountPoints)
{
var player = mountPoint.mountable.GetMounted();
if ((object)player != null && IsAuthed(cupboard, player.userID))
if (player is not null && cupboard.IsAuthed(player.userID))
return True;
}
}

foreach (var child in target.children)
// Block targeting if any passenger is authed (e.g., in the back of a Scrap Heli)
foreach (var child in vehicle.children)
{
var player = child as BasePlayer;
if ((object)player != null)
if (child is BasePlayer player)
{
if (IsAuthed(cupboard, player.userID))
if (cupboard.IsAuthed(player.userID))
return True;
}
}

// Don't interfere with targeting in this case
return null;
}

Expand All @@ -52,7 +92,7 @@ private static bool IsOccupied(BaseCombatEntity entity, List<MountPointInfo> mou
foreach (var mountPoint in mountPoints)
{
var player = mountPoint.mountable.GetMounted();
if ((object)player != null)
if (player is not null)
return true;
}
}
Expand All @@ -65,16 +105,5 @@ private static bool IsOccupied(BaseCombatEntity entity, List<MountPointInfo> mou

return false;
}

private static bool IsAuthed(BuildingPrivlidge cupboard, ulong userId)
{
foreach (var entry in cupboard.authorizedPlayers)
{
if (entry.userid == userId)
return true;
}

return false;
}
}
}