Skip to content

Core - Restrict deletion request #353

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
Kexanone wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Core - Restrict deletion request #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfd03f8
Limit requests to distance and loadtime entities
Kexanone Dec 28, 2025
0566b53
Remove extra newlines
Kexanone Dec 28, 2025
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
29 changes: 29 additions & 0 deletions addons/core/scripts/Game/ACE_Core/Player/SCR_PlayerController.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//------------------------------------------------------------------------------------------------
modded class SCR_PlayerController : PlayerController
{
protected static const float ACE_MAX_DELETED_DISTANCE_M = 5; // Maximum distance for deletion requests to be granted

//------------------------------------------------------------------------------------------------
//! Request deletion of unreplicated entity from all machines
//! Called from local player
Expand All @@ -16,6 +18,13 @@ modded class SCR_PlayerController : PlayerController
[RplRpc(RplChannel.Reliable, RplRcver.Server)]
protected void RpcAsk_ACE_DeleteEntityByID(EntityID entityID)
{
IEntity entity = GetGame().GetWorld().FindEntityByID(entityID);
if (!entity)
return;

if (!ACE_IsDeletionGrantedByServer(entity))
return;

ACE_LoadtimeEntityManager manager = ACE_LoadtimeEntityManager.GetInstance();
if (!manager)
return;
Expand All @@ -39,6 +48,9 @@ modded class SCR_PlayerController : PlayerController
if (!entity)
return;

if (!ACE_IsDeletionGrantedByServer(entity))
return;

float health = entity.GetCurrentHealth();
if (health > 0)
entity.HandleDamage(EDamageType.TRUE, health, hitPosDirNorm);
Expand All @@ -57,6 +69,22 @@ modded class SCR_PlayerController : PlayerController
GetGame().GetCallqueue().CallLater(manager.DeleteEntitiesByIdGlobal, deletionDelayMS, false, {entity.GetID()});
}

//------------------------------------------------------------------------------------------------
//! Check whether player is allowed deleting the entity
protected bool ACE_IsDeletionGrantedByServer(IEntity entityToDelete)
{
// Only physical loadtime entities can be deleted
if (!entityToDelete || !entityToDelete.IsLoaded() || !entityToDelete.GetVObject())
return false;

SCR_ChimeraCharacter playerChar = SCR_ChimeraCharacter.Cast(GetControlledEntity());
if (!playerChar)
return false;

// Can only delete nearby entities
return (vector.Distance(playerChar.GetOrigin(), entityToDelete.GetOrigin()) <= ACE_MAX_DELETED_DISTANCE_M);
}

//------------------------------------------------------------------------------------------------
void ACE_RequestAnimateWithHelperCompartment(ACE_EAnimationHelperID helperID)
{
Expand All @@ -74,4 +102,5 @@ modded class SCR_PlayerController : PlayerController

ACE_AnimationTools.AnimateWithHelperCompartment(helperID, char);
}

}
5 changes: 3 additions & 2 deletions addons/core/scripts/Game/ACE_Core/Systems/ACE_LoadtimeEntityManager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ACE_LoadtimeEntityManager : GameSystem

//------------------------------------------------------------------------------------------------
//! Ensures that already deleted unreplicated entities are deleted for JIPs
void DeleteInitialEntities()
protected void DeleteInitialEntities()
{
foreach (ACE_EntityIdWrapper idWrapper : m_aDeletedEntityIDs)
{
Expand Down Expand Up @@ -68,8 +68,9 @@ class ACE_LoadtimeEntityManager : GameSystem
//! Deletes unreplicated entity by ID on a local machine
void DeleteEntityByIdLocal(EntityID entityID)
{
// Only physical loadtime entities can be deleted
IEntity entity = GetGame().GetWorld().FindEntityByID(entityID);
if (entity)
if (entity && entity.IsLoaded() && entity.GetVObject())
delete entity;
}

Expand Down