MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-07 14:56:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix player join/leave suppression when switching worlds

Browse Source
This commit is contained in:
Natsumi
2022-08-28 00:05:22 +12:00
parent 3d4504024e
commit 2265851a2b
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+11 -7
View File
@@ -6632,6 +6632,11 @@ speechSynthesis.getVoices();
} }
var ref = API.cachedUsers.get(id); var ref = API.cachedUsers.get(id);
var isVIP = API.cachedFavoritesByObjectId.has(id); var isVIP = API.cachedFavoritesByObjectId.has(id);
var location = '';
var $location_at = '';
if (typeof ref !== 'undefined') {
var {location, $location_at} = ref;
}
if (typeof stateInput === 'undefined' || ctx.state === stateInput) { if (typeof stateInput === 'undefined' || ctx.state === stateInput) {
// this is should be: undefined -> user // this is should be: undefined -> user
if (ctx.ref !== ref) { if (ctx.ref !== ref) {
@@ -6724,7 +6729,6 @@ speechSynthesis.getVoices();
return; return;
} }
this.updateFriendInProgress.set(id, Date.now()); this.updateFriendInProgress.set(id, Date.now());
var {location, $location_at} = ref;
// wait 2minutes then check if user came back online // wait 2minutes then check if user came back online
workerTimers.setTimeout(() => { workerTimers.setTimeout(() => {
this.updateFriendInProgress.delete(id); this.updateFriendInProgress.delete(id);
@@ -6738,7 +6742,6 @@ speechSynthesis.getVoices();
); );
}, 110000); }, 110000);
} else { } else {
var {location, $location_at} = ref;
this.updateFriendDelayedCheck( this.updateFriendDelayedCheck(
id, id,
ctx, ctx,
@@ -8105,16 +8108,17 @@ speechSynthesis.getVoices();
switch (gameLog.type) { switch (gameLog.type) {
case 'location-destination': case 'location-destination':
if (this.isGameRunning) { if (this.isGameRunning) {
// needs to be added before OnPlayerLeft entries from LocationReset
this.addGameLog({
created_at: gameLog.dt,
type: 'LocationDestination',
location: gameLog.location
});
this.lastLocationReset(); this.lastLocationReset();
this.lastLocation.location = 'traveling'; this.lastLocation.location = 'traveling';
this.lastLocationDestination = gameLog.location; this.lastLocationDestination = gameLog.location;
this.lastLocationDestinationTime = Date.parse(gameLog.dt); this.lastLocationDestinationTime = Date.parse(gameLog.dt);
this.updateCurrentUserLocation(); this.updateCurrentUserLocation();
var entry = {
created_at: gameLog.dt,
type: 'LocationDestination',
location: gameLog.location
};
this.clearNowPlaying(); this.clearNowPlaying();
this.updateCurrentInstanceWorld(); this.updateCurrentInstanceWorld();
this.applyUserDialogLocation(); this.applyUserDialogLocation();