thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix weird crash, fix timer on mid-game join, fix client game state on end

Browse source
This commit is contained in:
RandomityGuy 2024-05-28 01:53:48 +05:30
parent 059f8a2add
commit 7884e829a2
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/MarbleWorld.hx
View file

@ -1810,18 +1810,18 @@ class MarbleWorld extends Scheduler {
var gameplayHigh = ourStartTime - ticksSinceTimerStart * 0.032; var gameplayHigh = ourStartTime - ticksSinceTimerStart * 0.032;
var gameplayLow = ourStartTime - (ticksSinceTimerStart + 1) * 0.032; var gameplayLow = ourStartTime - (ticksSinceTimerStart + 1) * 0.032;
// Clamp timer to be between these two // Clamp timer to be between these two
if (gameplayLow > this.timeState.gameplayClock) {
this.timeState.gameplayClock = gameplayLow - this.timeState.gameplayClock + gameplayHigh;
}
if (gameplayHigh < this.timeState.gameplayClock) { if (gameplayHigh < this.timeState.gameplayClock || gameplayLow > this.timeState.gameplayClock) {
this.timeState.gameplayClock = gameplayLow + this.timeState.gameplayClock - gameplayHigh; var clockTicks = Math.floor((ourStartTime - this.timeState.gameplayClock) / 0.032);
var clockTickTime = ourStartTime - clockTicks * 0.032;
var delta = clockTickTime - this.timeState.gameplayClock;
this.timeState.gameplayClock = gameplayHigh - delta;
} }
} }
this.timeState.gameplayClock += dt * timeMultiplier; this.timeState.gameplayClock += dt * timeMultiplier;
} }
if (this.timeState.gameplayClock < 0) if (this.timeState.gameplayClock < 0 && !Net.isClient)
this.gameMode.onTimeExpire(); this.gameMode.onTimeExpire();
} }
if (!this.isMultiplayer || this.multiplayerStarted) if (!this.isMultiplayer || this.multiplayerStarted)

13
src/modes/HuntMode.hx
View file

@ -634,14 +634,13 @@ class HuntMode extends NullMode {
level.cancel(@:privateAccess level.marble.oobSchedule); level.cancel(@:privateAccess level.marble.oobSchedule);
if (!level.isWatching) { if (!level.isWatching) {
if (level.isMultiplayer) { if (level.isMultiplayer) {
if (Net.isHost) { for (marble in level.marbles) {
for (marble in level.marbles) { marble.setMode(Start);
marble.setMode(Start); level.cancel(@:privateAccess marble.oobSchedule);
level.cancel(@:privateAccess marble.oobSchedule);
}
NetCommands.timerRanOut();
} }
if (Net.isHost)
NetCommands.timerRanOut();
if (!level.isWatching) { if (!level.isWatching) {
@:privateAccess level.schedule(level.timeState.currentAttemptTime + 5, () -> cast level.mpFinish()); @:privateAccess level.schedule(level.timeState.currentAttemptTime + 5, () -> cast level.mpFinish());
} }

4
src/net/Net.hx
View file

@ -140,6 +140,8 @@ class Net {
var finishSdp = () -> { var finishSdp = () -> {
if (sdpFinished) if (sdpFinished)
return; return;
if (peer == null)
return;
sdpFinished = true; sdpFinished = true;
var sdpObj = StringTools.trim(peer.localDescription); var sdpObj = StringTools.trim(peer.localDescription);
sdpObj = sdpObj + '\r\n' + candidates.join('\r\n') + '\r\n'; sdpObj = sdpObj + '\r\n' + candidates.join('\r\n') + '\r\n';
@ -218,6 +220,8 @@ class Net {
if (sdpFinished) if (sdpFinished)
return; return;
sdpFinished = true; sdpFinished = true;
if (client == null)
return;
Console.log("Local Description Set!"); Console.log("Local Description Set!");
var sdpObj = StringTools.trim(client.localDescription); var sdpObj = StringTools.trim(client.localDescription);
sdpObj = sdpObj + '\r\n' + candidates.join('\r\n') + '\r\n'; sdpObj = sdpObj + '\r\n' + candidates.join('\r\n') + '\r\n';