tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix weird lifestage autorefactors.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-09 12:29:27 +01:00
parent 3a9e1ff929
commit 8b09d55b10
43 changed files with 55 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/DragDrop/DragDropSystem.cs
View File

@@ -175,7 +175,7 @@ namespace Content.Client.DragDrop
private bool OnBeginDrag()
{
if (_dragDropHelper.Dragged == default || (!EntityManager.EntityExists(_dragDropHelper.Dragged) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(_dragDropHelper.Dragged).EntityLifeStage) >= EntityLifeStage.Deleted)
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged))
{
// something happened to the clicked entity or we moved the mouse off the target so
// we shouldn't replay the original click
@@ -212,7 +212,7 @@ namespace Content.Client.DragDrop
private bool OnContinueDrag(float frameTime)
{
if (_dragDropHelper.Dragged == default || (!EntityManager.EntityExists(_dragDropHelper.Dragged) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(_dragDropHelper.Dragged).EntityLifeStage) >= EntityLifeStage.Deleted)
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged))
{
return false;
}
@@ -352,10 +352,8 @@ namespace Content.Client.DragDrop
private void HighlightTargets()
{
if (_dragDropHelper.Dragged == default ||
(!EntityManager.EntityExists(_dragDropHelper.Dragged) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(_dragDropHelper.Dragged).EntityLifeStage) >= EntityLifeStage.Deleted ||
_dragShadow == default ||
(!EntityManager.EntityExists(_dragShadow) ? EntityLifeStage.Deleted : EntityManager.GetComponent<MetaDataComponent>(_dragShadow).EntityLifeStage) >= EntityLifeStage.Deleted)
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged) ||
_dragShadow == default || Deleted(_dragShadow))
{
Logger.Warning("Programming error. Can't highlight drag and drop targets, not currently " +
"dragging anything or dragged entity / shadow was deleted.");