Add per-player time offset #7002

Arcelmi · 2018-02-02T19:09:43Z

With this pull request it's possible to change the timeOfDay of a certain player for e.g. 1 hour. So it's possible to make in-game time zones or something like this.
Unlike override_day_night_ratio it also change the position of the moon and sun and not only the sunlight. And it isn't static like override_day_night_ratio and is relative to the timeOfDay.
It's also possible to make machines that change the time in a certain radius and many other possibilities. It's also useful on minigame-servers when players in different minigames have got different daytime.

sfan5 · 2018-02-02T19:13:05Z

interesting 🤔

sfan5 · 2018-02-02T19:13:47Z

doc/lua_api.txt

@@ -3783,6 +3783,9 @@ This is basically a reference to a C++ `ServerActiveObject`
    * `0`...`1`: Overrides day-night ratio, controlling sunlight to a specific amount
    * `nil`: Disables override, defaulting to sunlight based on day-night cycle
 * `get_day_night_ratio()`: returns the ratio or nil if it isn't overridden
+* `set_time_offset(offset)`
+	* Adds offset to the time of the player (e.g. TimeOfDay is 12:00 and the offset of the player is 1000 then the time of the player is 13:00)


put the example on a separate line

sfan5 · 2018-02-02T19:14:33Z

doc/lua_api.txt

@@ -3783,6 +3783,9 @@ This is basically a reference to a C++ `ServerActiveObject`
    * `0`...`1`: Overrides day-night ratio, controlling sunlight to a specific amount
    * `nil`: Disables override, defaulting to sunlight based on day-night cycle
 * `get_day_night_ratio()`: returns the ratio or nil if it isn't overridden
+* `set_time_offset(offset)`
+	* Adds offset to the time of the player (e.g. TimeOfDay is 12:00 and the offset of the player is 1000 then the time of the player is 13:00)
+* `get_time_offset()` returns the offset


* `get_time_offset()`: returns the players time of day offset

would be better

sfan5 · 2018-02-02T19:15:06Z

src/remoteplayer.h

+		m_time_offset = offset;
+	}
+
+	void getTimeOffset(u16 *offset)


is there a reason why this isn't u16 getTimeOffset() const?

Why not just return the number instead of using a pointer?

I used getDayNightRatio as an example because I'm not so good in c++.

sfan5 · 2018-02-02T19:16:50Z

src/script/lua_api/l_object.cpp

+
+	int offset_i = luaL_checknumber(L, 2);
+	u16 offset = offset_i;
+	//Negative values


why is the offset not just a signed number (s16)?

Because timeofday is an unsigned number and when I add a negative offset to timeofday and timeofday<0 then it would be the wrong time.

either way, an offset of, say, 23999 would effectively work the same, and if anything you could perform a modulus (t % 24000)

sfan5 · 2018-02-02T19:18:18Z

src/script/lua_api/l_object.cpp

+	}
+
+	player->setTimeOffset(offset);
+	getServer(L)->setTimeOfDay(getEnv(L)->getTimeOfDay());


better just resend the time to that one player

sfan5 · 2018-02-02T19:18:36Z

src/server.cpp

 	}
 	else {
+		NetworkPacket pkt(TOCLIENT_TIME_OF_DAY, 0, peer_id);
+		pkt << time << time_speed;


this code does not account for time offsets

sfan5 · 2018-02-02T19:20:18Z

src/server.cpp

+			player->getTimeOffset(&time_offset);
+			u16 ntime = (time+time_offset);
+			pkt << ntime << time_speed;
+			Send(&pkt);


you could move the actual implementation into the else and have this code only call SendTimeOfDay(peer_id, time, time_speed) for each player

Ekdohibs · 2018-02-02T22:49:37Z

While you're doing this, could you add per-player time speed as well please?

rubenwardy · 2018-02-04T03:38:41Z

src/server.cpp

+		for (auto &client_name : m_clients.getPlayerNames()) {
+			RemotePlayer *player = m_env->getPlayer(client_name.c_str());
+			peer_id = player->getPeerId();
+			NetworkPacket pkt(TOCLIENT_TIME_OF_DAY, 0, peer_id);


please add a blank line above here

rubenwardy

see comments

SmallJoker · 2018-02-04T13:45:47Z

doc/lua_api.txt

@@ -3783,6 +3783,10 @@ This is basically a reference to a C++ `ServerActiveObject`
    * `0`...`1`: Overrides day-night ratio, controlling sunlight to a specific amount
    * `nil`: Disables override, defaulting to sunlight based on day-night cycle
 * `get_day_night_ratio()`: returns the ratio or nil if it isn't overridden
+* `set_time_offset(offset)`
+	* Adds offset to the time of the player 
+	* e.g. TimeOfDay is 12:00 and the offset of the player is 1000 then the time of the player is 13:00


wrong indents

SmallJoker · 2018-02-04T13:47:02Z

src/script/lua_api/l_object.cpp

+	//Negative values
+	if (offset_i<0){
+		offset = 24000+offset_i;
+	}


Remove brackets or add a space after ) -> 0) {

SmallJoker · 2018-02-04T13:47:19Z

src/script/lua_api/l_object.cpp

+	u16 offset = offset_i;
+	//Negative values
+	if (offset_i<0){
+		offset = 24000+offset_i;


Spaces around operator
http://dev.minetest.net/Code_style_guidelines

SmallJoker · 2018-02-04T13:47:42Z

src/script/lua_api/l_object.cpp

+	}
+
+	player->setTimeOffset(offset);
+	getServer(L)->SendTimeOfDay(player->getPeerId(), getEnv(L)->getTimeOfDay(), g_settings->getFloat("time_speed"));


Line >80 characters

SmallJoker · 2018-02-04T13:49:34Z

src/script/lua_api/l_object.cpp

+	player->setTimeOffset(offset);
+	getServer(L)->SendTimeOfDay(player->getPeerId(), getEnv(L)->getTimeOfDay(), g_settings->getFloat("time_speed"));
+
+	lua_pushboolean(L, true);


Useless return value as the player object must logically be valid and there's no way to fail otherwise.

It returns nil if (player == NULL).

SmallJoker · 2018-02-04T13:51:05Z

src/server.cpp

+		// When the player is joining, player is NULL
+		if (!player){
+			return;
+		}


Same as above. Either remove brackets or put a space after )

SmallJoker · 2018-02-04T13:59:56Z

src/server.cpp


 	if (peer_id == PEER_ID_INEXISTENT) {
-		m_clients.sendToAll(&pkt);
+
+		for (auto &client_name : m_clients.getPlayerNames()) {


std::vector<session_t> clients = m_clients.getClientIDs(); for (const session_t peer_id : clients) { const RemotePlayer *player = m_env->getPlayer(peer_id); ... }

is faster.
EDIT: player can be NULL/nullptr, so use continue if that applies.

SmallJoker

Works.

SmallJoker · 2018-03-13T17:51:36Z

@Arcelmi Could you please satisfy LINT's needs so this can be merged after the 2nd approval? https://travis-ci.org/minetest/minetest/jobs/352884874

Testing mod:

minetest.register_chatcommand("timediff", {
	func = function(name, param)
		local player = minetest.get_player_by_name(name)
		player:set_time_offset(tonumber(param) or 0);
	end
})

paramat · 2018-03-13T20:06:32Z

LINT's requests are unacceptable here.
I disagree we should change our codestyle to satisfy LINT, you can add this file to the LINT whitelist instead https://github.com/minetest/minetest/blob/master/util/travis/clang-format-whitelist.txt most files are already there.

SmallJoker · 2018-03-14T17:24:35Z

@paramat So in that case.. merge this PR without regard of LINT as soon it has two approvals? That would be ok for me too.

paramat · 2018-03-14T18:14:26Z

Ok, but best it is added to the whitelist by the author.

nerzhul · 2018-03-14T20:08:00Z

just a note: this totally break mechanics based on time, with that player will have an offset for time based events

sfan5 · 2018-04-19T09:26:20Z

src/script/lua_api/l_object.cpp

+	//Negative values
+	if (offset_i < 0) {
+		offset = 24000 + offset_i;
+	}


brace removal, also the comment should explain why it's unsigned

sfan5 · 2018-04-19T09:28:01Z

src/script/lua_api/l_object.cpp

+	}
+
+	player->setTimeOffset(offset);
+	getServer(L)->SendTimeOfDay(player->getPeerId(), 


IMO this should not be done directly from here
instead of making SendTimeOfDay public, add a method in Serve such as updatePlayerTime() that does this

sfan5 · 2018-04-19T09:28:38Z

src/server.cpp

+		std::vector<session_t> clients = m_clients.getClientIDs();
+		for (const session_t peer_id : clients) {
+			RemotePlayer *player = m_env->getPlayer(peer_id);
+			if (player) {


if (!player) continue; [...]

src/server.cpp

util/travis/clang-format-whitelist.txt

doc/lua_api.txt

Arcelmi added 4 commits February 2, 2018 14:11

Add setTimeOffset and getTimeOffset

9f7b789

Send time of day per-player separately

bbd6d11

Add set_time_offset and get_time_offset

8360eca

Add set_time_offset and get_time_offset

e1f8ebd

sfan5 added @ Script API @ Client / Audiovisuals Feature ✨ PRs that add or enhance a feature labels Feb 2, 2018

sfan5 requested changes Feb 2, 2018

View reviewed changes

Arcelmi added 7 commits February 2, 2018 22:29

Change set_time_offset description

4e4a91a

Change SendTimeOfDay to public

68b2d61

Fix missing code for time offsets

0ad2f9a

Change return output of getTimeOffset

e232279

Send time of day after offset changes only to player

866b5b9

Wrong folder

008075c

Send timeofday on offset changes only to one client

4e01067

rubenwardy reviewed Feb 4, 2018

View reviewed changes

Add blank line above loop

4333f28

SmallJoker reviewed Feb 4, 2018

View reviewed changes

rubenwardy added the Action / change needed Code still needs changes (PR) / more information requested (Issues) label Feb 4, 2018

Arcelmi added 2 commits February 5, 2018 10:58

Fix wrong indents

34ca122

Add space after conditions

8d235fb

Arcelmi added 4 commits February 24, 2018 11:11

Remove return in loop

a52acb7

Add spaces arround operator

9b2afd9

Change player==NULL to !player

c00f425

Changed player==null to !player

a12684e

SmallJoker approved these changes Mar 13, 2018

View reviewed changes

SmallJoker added the One approval ✅ ◻️ label Mar 13, 2018

Arcelmi added 2 commits April 12, 2018 19:32

Add files to clang whitelist

b81517d

Fix mistake

b7204e3

sfan5 requested changes Apr 19, 2018

View reviewed changes

paramat reviewed Apr 19, 2018

View reviewed changes

doc/lua_api.txt Outdated Show resolved Hide resolved

Arcelmi added 4 commits April 22, 2018 18:55

Change time offset description

217f765

Remove unnecessary braces

f4840bd

Change condition to modulo

e7cfd67

Change unsigned to signed int

45fd9cb

paramat removed the Action / change needed Code still needs changes (PR) / more information requested (Issues) label Aug 1, 2018

paramat added this to the 5.1.0 milestone Dec 30, 2018

paramat removed this from the 5.1.0 milestone May 8, 2019

rubenwardy force-pushed the master branch 2 times, most recently from 0e3b135 to 39c54e1 Compare June 21, 2019 00:46

sfan5 added the Rebase needed The PR needs to be rebased by its author. label Aug 12, 2019

rubenwardy requested a review from sfan5 March 6, 2020 19:17

rubenwardy added the Possible close label Mar 6, 2020

rubenwardy closed this Jun 17, 2020

rubenwardy added the Adoption needed The pull request needs someone to adopt it. Adoption welcomed! label Jun 17, 2020

Zughy removed the Adoption needed The pull request needs someone to adopt it. Adoption welcomed! label May 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add per-player time offset #7002

Add per-player time offset #7002

Arcelmi commented Feb 2, 2018

sfan5 commented Feb 2, 2018

sfan5 Feb 2, 2018

sfan5 Feb 2, 2018

sfan5 Feb 2, 2018

red-001 Feb 2, 2018

Arcelmi Feb 2, 2018

sfan5 Feb 2, 2018

Arcelmi Feb 2, 2018

rdococ Mar 23, 2018

sfan5 Feb 2, 2018

sfan5 Feb 2, 2018

sfan5 Feb 2, 2018

Ekdohibs commented Feb 2, 2018

rubenwardy Feb 4, 2018

rubenwardy left a comment

SmallJoker Feb 4, 2018

SmallJoker Feb 4, 2018

SmallJoker Feb 4, 2018 •

edited

SmallJoker Feb 4, 2018

SmallJoker Feb 4, 2018

Arcelmi Feb 5, 2018

SmallJoker Feb 4, 2018

SmallJoker Feb 4, 2018 •

edited

SmallJoker left a comment

SmallJoker commented Mar 13, 2018 •

edited

paramat commented Mar 13, 2018 •

edited

SmallJoker commented Mar 14, 2018 •

edited

paramat commented Mar 14, 2018

nerzhul commented Mar 14, 2018

sfan5 Apr 19, 2018

sfan5 Apr 19, 2018

sfan5 Apr 19, 2018

Add per-player time offset #7002

Add per-player time offset #7002

Conversation

Arcelmi commented Feb 2, 2018

sfan5 commented Feb 2, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ekdohibs commented Feb 2, 2018

Choose a reason for hiding this comment

rubenwardy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SmallJoker Feb 4, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SmallJoker Feb 4, 2018 • edited

Choose a reason for hiding this comment

SmallJoker left a comment

Choose a reason for hiding this comment

SmallJoker commented Mar 13, 2018 • edited

paramat commented Mar 13, 2018 • edited

SmallJoker commented Mar 14, 2018 • edited

paramat commented Mar 14, 2018

nerzhul commented Mar 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SmallJoker Feb 4, 2018 •

edited

SmallJoker Feb 4, 2018 •

edited

SmallJoker commented Mar 13, 2018 •

edited

paramat commented Mar 13, 2018 •

edited

SmallJoker commented Mar 14, 2018 •

edited