Fix Instantiate check

This commit is contained in:
Natsumi
2021-12-24 19:57:11 +13:00
parent 980fc118a3
commit 5631f4c62a
+12 -13
View File
@@ -7546,6 +7546,7 @@ speechSynthesis.getVoices();
this.photonLobby = new Map(); this.photonLobby = new Map();
this.photonLobbyCurrent = new Map(); this.photonLobbyCurrent = new Map();
this.photonLobbyMaster = 0; this.photonLobbyMaster = 0;
this.photonLobbyCurrentUser = 0;
this.photonLobbyInVrMode = new Map(); this.photonLobbyInVrMode = new Map();
this.photonLobbyWatcherLoopStop(); this.photonLobbyWatcherLoopStop();
this.photonLobbyAvatars = new Map(); this.photonLobbyAvatars = new Map();
@@ -8046,6 +8047,7 @@ speechSynthesis.getVoices();
$app.data.moderationAgainstTable = []; $app.data.moderationAgainstTable = [];
$app.data.photonLobby = new Map(); $app.data.photonLobby = new Map();
$app.data.photonLobbyMaster = 0; $app.data.photonLobbyMaster = 0;
$app.data.photonLobbyCurrentUser = 0;
$app.data.photonLobbyInVrMode = new Map(); $app.data.photonLobbyInVrMode = new Map();
$app.data.photonLobbyCurrent = new Map(); $app.data.photonLobbyCurrent = new Map();
$app.data.photonLobbyAvatars = new Map(); $app.data.photonLobbyAvatars = new Map();
@@ -8490,9 +8492,13 @@ speechSynthesis.getVoices();
); );
} }
this.parsePhotonLobbyIds(data.Parameters[252]); this.parsePhotonLobbyIds(data.Parameters[252]);
var hasInstantiated = false;
if (this.photonLobbyCurrentUser === data.Parameters[254]) {
hasInstantiated = true;
}
this.photonLobbyJointime.set(data.Parameters[254], { this.photonLobbyJointime.set(data.Parameters[254], {
joinTime: Date.parse(gameLogDate), joinTime: Date.parse(gameLogDate),
hasInstantiated: false, hasInstantiated,
isInvisible: data.Parameters[249].isInvisible, isInvisible: data.Parameters[249].isInvisible,
inVRMode: data.Parameters[249].inVRMode, inVRMode: data.Parameters[249].inVRMode,
avatarEyeHeight: data.Parameters[249].avatarEyeHeight avatarEyeHeight: data.Parameters[249].avatarEyeHeight
@@ -8822,7 +8828,7 @@ speechSynthesis.getVoices();
!lobbyJointime.hasInstantiated !lobbyJointime.hasInstantiated
) { ) {
var time = timeToText(Date.now() - lobbyJointime.joinTime); var time = timeToText(Date.now() - lobbyJointime.joinTime);
text = `Left without instantiating ${time}`; text = `Bot/Player left without instantiating ${time}`;
} }
if (text) { if (text) {
this.addEntryPhotonEvent({ this.addEntryPhotonEvent({
@@ -8839,16 +8845,6 @@ speechSynthesis.getVoices();
user, user,
gameLogDate gameLogDate
) { ) {
var lobbyJointime = this.photonLobbyJointime.get(photonId);
if (
typeof lobbyJointime !== 'undefined' &&
!lobbyJointime.hasInstantiated
) {
this.photonLobbyJointime.set(photonId, {
...lobbyJointime,
hasInstantiated: true
});
}
var tags = []; var tags = [];
if (typeof user.tags !== 'undefined') { if (typeof user.tags !== 'undefined') {
tags = user.tags; tags = user.tags;
@@ -18146,7 +18142,7 @@ speechSynthesis.getVoices();
} }
this.photonLobbyJointime.set(id, { this.photonLobbyJointime.set(id, {
joinTime: Date.parse(dateTime), joinTime: Date.parse(dateTime),
hasInstantiated: true, hasInstantiated: false,
isInvisible: user.isInvisible, isInvisible: user.isInvisible,
inVRMode: user.inVRMode, inVRMode: user.inVRMode,
avatarEyeHeight: user.avatarEyeHeight avatarEyeHeight: user.avatarEyeHeight
@@ -18162,6 +18158,9 @@ speechSynthesis.getVoices();
) { ) {
this.setPhotonLobbyMaster(data.Parameters[248][248]); this.setPhotonLobbyMaster(data.Parameters[248][248]);
} }
if (typeof data.Parameters[254] !== 'undefined') {
this.photonLobbyCurrentUser = data.Parameters[254];
}
break; break;
} }
}; };