Skip to content

fix: don't reset player minutes on worldtime change (#631) #1253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LopezDev7 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: don't reset player minutes on worldtime change (#631) #1253

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b8c003
fix: don't reset player minutes on worldtime change (#631)
LopezDev7 Aug 15, 2026
79b0632
fix: don't touch clocked players' time on worldtime change
LopezDev7 Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Server/Source/core_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2151,7 +2151,17 @@ class Core final : public ICore, public PlayerConnectEventHandler, public Consol

for (IPlayer* player : players.entries())
{
static_cast<Player*>(player)->time_ = time;
Player* impl = static_cast<Player*>(player);
// Players with the clock on ignore SetWorldTime on the client,
// so leave their stored time alone or GetPlayerTime desyncs
// from what they actually see.
if (impl->hasClock())
{
continue;
}
// Override the hour only, keeping minutes, like SA:MP.
// https://github.com/openmultiplayer/open.mp/issues/631
impl->time_ = time + (impl->time_ % Hours(1));
}

updateNetworks();
Expand Down
Loading