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

Clean up playersInInstance

Browse Source
This commit is contained in:
Natsumi
2021-03-28 01:48:30 +13:00
parent 0f366c2785
commit 25671e397a
1 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+8 -29
View File
@@ -3737,14 +3737,7 @@ speechSynthesis.getVoices();
} }
var joining = true; var joining = true;
var playersInInstance = this.lastLocation.playerList; var playersInInstance = this.lastLocation.playerList;
for (var i = 0; i < playersInInstance.length; i++) { if (!playersInInstance.includes(ctx.displayName)) {
var player = playersInInstance[i];
if (player === ctx.displayName) {
joining = false;
break;
}
}
if (joining) {
var onPlayerJoining = { var onPlayerJoining = {
...ctx, ...ctx,
type: 'OnPlayerJoining' type: 'OnPlayerJoining'
@@ -7478,17 +7471,10 @@ speechSynthesis.getVoices();
} }
if (this.isGameRunning && if (this.isGameRunning &&
this.lastLocation.location === L.tag) { this.lastLocation.location === L.tag) {
var ref = API.cachedUsers.get(API.currentUser.id); var ref = API.currentUser;
if (typeof ref === 'undefined') {
ref = API.currentUser;
}
var playersInInstance = this.lastLocation.playerList; var playersInInstance = this.lastLocation.playerList;
for (var i = 0; i < playersInInstance.length; i++) { if (playersInInstance.includes(ref.displayName)) {
var player = playersInInstance[i]; users.push(ref);
if (ref.displayName === player) {
users.push(ref);
break;
}
} }
var friendsInInstance = this.lastLocation.friendList; var friendsInInstance = this.lastLocation.friendList;
for (var i = 0; i < friendsInInstance.length; i++) { for (var i = 0; i < friendsInInstance.length; i++) {
@@ -8040,17 +8026,10 @@ speechSynthesis.getVoices();
}; };
instances[instance.id] = instance; instances[instance.id] = instance;
} }
var ref = API.cachedUsers.get(API.currentUser.id); var ref = API.currentUser;
if (typeof ref === 'undefined') { var playersInInstance = this.lastLocation.playerList;
ref = API.currentUser; if (playersInInstance.includes(ref.displayName)) {
} instance.users.push(ref);
var playerInInstance = this.lastLocation.playerList;
for (var i = 0; i < playerInInstance.length; i++) {
var player = playerInInstance[i];
if (ref.displayName === player) {
instance.users.push(ref);
break;
}
} }
var friendsInInstance = this.lastLocation.friendList; var friendsInInstance = this.lastLocation.friendList;
for (var i = 0; i < friendsInInstance.length; i++) { for (var i = 0; i < friendsInInstance.length; i++) {