MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-18 22:33:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Random fixes

Browse Source
This commit is contained in:
Natsumi
2025-11-15 02:58:13 +11:00
parent cd2312bee1
commit 8f16f15443
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/stores/instance.js
View File

@@ -557,7 +557,7 @@ export const useInstanceStore = defineStore('Instance', () => {
);
const lastLocation$ = cachedCurrentUser?.$location;
const playersInInstance = locationStore.lastLocation.playerList;
if (lastLocation$.worldId === D.id && playersInInstance.size > 0) {
if (lastLocation$?.worldId === D.id && playersInInstance.size > 0) {
// pull instance json from cache
const friendsInInstance = locationStore.lastLocation.friendList;
instance = {
@@ -589,7 +589,7 @@ export const useInstanceStore = defineStore('Instance', () => {
typeof ref === 'undefined' ||
typeof ref.$location === 'undefined' ||
ref.$location.worldId !== D.id ||
(ref.$location.instanceId === lastLocation$.instanceId &&
(ref.$location.instanceId === lastLocation$?.instanceId &&
playersInInstance.size > 0 &&
ref.location !== 'traveling')
) {
@@ -683,7 +683,7 @@ export const useInstanceStore = defineStore('Instance', () => {
// sort selected and current instance to top
if (
b.location === D.$location.tag ||
b.location === lastLocation$.tag
b.location === lastLocation$?.tag
) {
// sort selected instance above current instance
if (a.location === D.$location.tag) {
@@ -693,7 +693,7 @@ export const useInstanceStore = defineStore('Instance', () => {
}
if (
a.location === D.$location.tag ||
a.location === lastLocation$.tag
a.location === lastLocation$?.tag
) {
// sort selected instance above current instance
if (b.location === D.$location.tag) {
@@ -760,10 +760,10 @@ export const useInstanceStore = defineStore('Instance', () => {
const cachedCurrentUser = userStore.cachedUsers.get(
userStore.currentUser.id
);
const lastLocation$ = cachedCurrentUser.$location;
const currentLocation = lastLocation$.tag;
const lastLocation$ = cachedCurrentUser?.$location;
const currentLocation = lastLocation$?.tag;
const playersInInstance = locationStore.lastLocation.playerList;
if (lastLocation$.groupId === D.id && playersInInstance.size > 0) {
if (lastLocation$?.groupId === D.id && playersInInstance.size > 0) {
const friendsInInstance = locationStore.lastLocation.friendList;
instance = {
id: lastLocation$.instanceId,
@@ -794,7 +794,7 @@ export const useInstanceStore = defineStore('Instance', () => {
typeof ref === 'undefined' ||
typeof ref.$location === 'undefined' ||
ref.$location.groupId !== D.id ||
(ref.$location.instanceId === lastLocation$.instanceId &&
(ref.$location.instanceId === lastLocation$?.instanceId &&
playersInInstance.size > 0 &&
ref.location !== 'traveling')
) {

2
src/stores/user.js
View File

@@ -758,7 +758,7 @@ export const useUserStore = defineStore('User', () => {
* @param {string} userId
*/
function showUserDialog(userId) {
if (!userId) {
if (!userId || typeof userId !== 'string') {
return;
}
const D = userDialog.value;