Skip to content

Commit

Permalink
Fix some more issues with Custom GUID avatars
Browse files Browse the repository at this point in the history
  • Loading branch information
riperiperi committed Nov 29, 2024
1 parent 97d92bf commit 9df59c2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion TSOClient/tso.simantics/Engine/VMThread.cs
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ public List<VMPieMenuInteraction> CheckAction(VMQueuedAction action, bool auto =
if (avatar.IsCat && (action.Flags & TTABFlags.AllowCats) == 0) return null;
if (avatar.IsDog && (action.Flags & TTABFlags.AllowDogs) == 0) return null;
}
else if (avatar.IsPet && avatar.AvatarState.Permissions < VMTSOAvatarPermissions.Admin) return null; //not allowed
else if (avatar.IsPet && (avatar.AvatarState.Permissions < VMTSOAvatarPermissions.Admin || auto)) return null; //not allowed

bool isActionGlobal = action.ActionRoutine.ID < 4096; // Ignore global actions for disabling interactions due to repair.
bool isRepair = (action.Flags & TTABFlags.TSOIsRepair) > 0;
Expand Down
1 change: 0 additions & 1 deletion TSOClient/tso.simantics/Entities/VMAvatar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,6 @@ public void UserLeaveLot()
}

var tree = GetRoutineWithOwner(LEAVE_LOT_TREE, Thread.Context);
var routine = tree.routine;

var qaction = GetAction(LEAVE_LOT_ACTION, this, Thread.Context, false);
if (qaction != null)
Expand Down

0 comments on commit 9df59c2

Please sign in to comment.