Merge main into feat/server-move-checks
TickCtx gained `collision` here; main's two newer initializers (lan_actions respawn, server_travel's server_ctx) now pass it too, as every other one does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -944,6 +944,7 @@ impl Game<'_> {
|
||||
},
|
||||
tick_rate: self.clock.rate(),
|
||||
tick_frozen: self.clock.frozen(),
|
||||
collision: Some(self.collision),
|
||||
};
|
||||
host.hub.respawn(i, spawn, &ctx);
|
||||
}
|
||||
|
||||
@@ -243,6 +243,7 @@ impl Game<'_> {
|
||||
},
|
||||
tick_rate: self.clock.rate(),
|
||||
tick_frozen: self.clock.frozen(),
|
||||
collision: Some(self.collision),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user