requested

Author: FDUTCH

server/session/world.go

@@ -227,8 +227,12 @@ func entityOffset(e world.Entity) mgl64.Vec3 {
 }
 
 // ViewTime ...
-func (s *Session) ViewTime(time int, doDayLightCycle bool) {
+func (s *Session) ViewTime(time int) {
 	s.writePacket(&packet.SetTime{Time: int32(time)})
+}
+
+// ViewTimeCycle ...
+func (s *Session) ViewTimeCycle(doDayLightCycle bool) {
 	s.sendGameRules([]protocol.GameRule{{Name: "dodaylightcycle", Value: doDayLightCycle}})
 }
 

server/world/tick.go

@@ -65,8 +65,8 @@ func (t ticker) tick(tx *Tx) {
 
 	if tick%20 == 0 {
 		for _, viewer := range viewers {
-			if w.Dimension().TimeCycle() {
-				viewer.ViewTime(tim, cycle)
+			if w.Dimension().TimeCycle() && cycle {
+				viewer.ViewTime(tim)
 			}
 			if w.Dimension().WeatherCycle() {
 				viewer.ViewWeather(rain, thunder)

server/world/viewer.go

@@ -39,7 +39,9 @@ type Viewer interface {
 	ViewChunk(pos ChunkPos, dim Dimension, blockEntities map[cube.Pos]Block, c *chunk.Chunk)
 	// ViewTime views the time of the world. It is called every time the time is changed or otherwise every
 	// second.
-	ViewTime(t int, doDayLightCycle bool)
+	ViewTime(t int)
+	// ViewTimeCycle controls the automatic time-of-day cycle (day and night) in the world for this viewer.
+	ViewTimeCycle(doDayLightCycle bool)
 	// ViewEntityItems views the items currently held by an Entity that is able to equip items.
 	ViewEntityItems(e Entity)
 	// ViewEntityArmour views the items currently equipped as armour by the Entity.
@@ -87,7 +89,8 @@ func (NopViewer) ViewEntityMovement(Entity, mgl64.Vec3, cube.Rotation, bool)
 func (NopViewer) ViewEntityVelocity(Entity, mgl64.Vec3)                                      {}
 func (NopViewer) ViewEntityTeleport(Entity, mgl64.Vec3)                                      {}
 func (NopViewer) ViewChunk(ChunkPos, Dimension, map[cube.Pos]Block, *chunk.Chunk)            {}
-func (NopViewer) ViewTime(int, bool)                                                         {}
+func (NopViewer) ViewTime(int)                                                               {}
+func (NopViewer) ViewTimeCycle(bool)                                                         {}
 func (NopViewer) ViewEntityItems(Entity)                                                     {}
 func (NopViewer) ViewEntityArmour(Entity)                                                    {}
 func (NopViewer) ViewEntityAction(Entity, EntityAction)                                      {}

server/world/world.go

@@ -598,12 +598,11 @@ func (w *World) SetTime(new int) {
 	}
 	w.set.Lock()
 	w.set.Time = int64(new)
-	timeCycle := w.set.TimeCycle
 	w.set.Unlock()
 
 	viewers, _ := w.allViewers()
 	for _, viewer := range viewers {
-		viewer.ViewTime(new, timeCycle)
+		viewer.ViewTime(new)
 	}
 }
 
@@ -639,6 +638,10 @@ func (w *World) enableTimeCycle(v bool) {
 	w.set.Lock()
 	defer w.set.Unlock()
 	w.set.TimeCycle = v
+	viewers, _ := w.allViewers()
+	for _, viewer := range viewers {
+		viewer.ViewTimeCycle(v)
+	}
 }
 
 // temperature returns the temperature in the World at a specific position.
@@ -1062,7 +1065,8 @@ func (w *World) addWorldViewer(l *Loader) {
 	w.viewers[l] = l.viewer
 	w.viewerMu.Unlock()
 
-	l.viewer.ViewTime(w.Time(), w.TimeCycle())
+	l.viewer.ViewTime(w.Time())
+	l.viewer.ViewTimeCycle(w.TimeCycle())
 	w.set.Lock()
 	raining, thundering := w.set.Raining, w.set.Raining && w.set.Thundering
 	w.set.Unlock()