This commit is contained in:
Red
2025-06-28 14:04:17 +03:00
committed by GitHub
parent ad2aaeb4c4
commit 36d0692bf8
2 changed files with 6 additions and 8 deletions

View File

@@ -164,9 +164,6 @@ public abstract partial class CP14SharedMagicSystem : EntitySystem
private void CastTelegraphy(Entity<CP14MagicEffectComponent> ent, CP14SpellEffectBaseArgs args)
{
if (!_timing.IsFirstTimePredicted)
return;
foreach (var effect in ent.Comp.TelegraphyEffects)
{
effect.Effect(EntityManager, args);
@@ -175,9 +172,6 @@ public abstract partial class CP14SharedMagicSystem : EntitySystem
private void CastSpell(Entity<CP14MagicEffectComponent> ent, CP14SpellEffectBaseArgs args)
{
if (!_timing.IsFirstTimePredicted)
return;
var ev = new CP14MagicEffectConsumeResourceEvent(args.User);
RaiseLocalEvent(ent, ref ev);

View File

@@ -2,8 +2,8 @@ using System.Text;
using Content.Shared._CP14.AuraDNA;
using Content.Shared.Actions;
using Content.Shared.Examine;
using Content.Shared.Mobs;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
@@ -14,6 +14,7 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly MetaDataSystem _meta = default!;
[Dependency] private readonly INetManager _net = default!;
public readonly EntProtoId MagicTraceProto = "CP14MagicVisionMarker";
@@ -59,7 +60,10 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
/// this direction can be seen in order to understand, for example, in which direction the spell was used.</param>
public void SpawnMagicVision(EntityCoordinates position, SpriteSpecifier? icon, string description, TimeSpan duration, EntityUid? aura = null, EntityCoordinates? target = null)
{
var ent = PredictedSpawnAtPosition(MagicTraceProto, position);
if (_net.IsClient)
return;
var ent = SpawnAtPosition(MagicTraceProto, position);
var markerComp = EnsureComp<CP14MagicVisionMarkerComponent>(ent);
markerComp.SpawnTime = _timing.CurTime;