Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

deleted check (#8893)

Browse Source
This commit is contained in:
EmoGarbage404
2022-06-17 03:22:09 -04:00
committed by GitHub
parent ce715a2851
commit 9adcb48173
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Polymorph/Systems/PolymorphableSystem.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Server.Polymorph.Systems
/// </summary> /// </summary>
/// <param name="target">The entity that will be transformed</param> /// <param name="target">The entity that will be transformed</param>
/// <param name="id">The id of the polymorph prototype</param> /// <param name="id">The id of the polymorph prototype</param>
public EntityUid? PolymorphEntity(EntityUid target, String id) public EntityUid? PolymorphEntity(EntityUid target, string id)
{ {
if (!_proto.TryIndex<PolymorphPrototype>(id, out var proto)) if (!_proto.TryIndex<PolymorphPrototype>(id, out var proto))
{ {
@@ -99,9 +99,8 @@ namespace Content.Server.Polymorph.Systems
comp.Prototype = proto; comp.Prototype = proto;
RaiseLocalEvent(child, new PolymorphComponentSetupEvent()); RaiseLocalEvent(child, new PolymorphComponentSetupEvent());
var targetXform = Transform(target);
var childXform = Transform(child); var childXform = Transform(child);
childXform.LocalRotation = targetXform.LocalRotation; childXform.LocalRotation = targetTransformComp.LocalRotation;
if (_container.TryGetContainingContainer(target, out var cont)) if (_container.TryGetContainingContainer(target, out var cont))
cont.Insert(child); cont.Insert(child);

3
Content.Server/Polymorph/Systems/PolymorphedEntitySystem.cs
View File

@@ -49,6 +49,9 @@ namespace Content.Server.Polymorph.Systems
if (!TryComp<PolymorphedEntityComponent>(uid, out var component)) if (!TryComp<PolymorphedEntityComponent>(uid, out var component))
return; return;
if (Deleted(component.Parent))
return;
var proto = component.Prototype; var proto = component.Prototype;
var uidXform = Transform(uid); var uidXform = Transform(uid);