implement beds , respawn anchors #938

FDUTCH · 2024-11-17T21:08:12Z

No description provided.

TwistedAsylumMC

Noticed a few problems after a quick look

server/block/respawn_anchor.go

server/world/sound/block.go

server/world/tick.go

server/world/world.go

server/player/player.go

TwistedAsylumMC

Still a few of my previous comments that have not been addressed, found some more issues after another look through

TwistedAsylumMC · 2024-11-18T13:58:18Z

server/block/bed.go

+// SpawnBlock represents a block using which player can set his spawn point.
+type SpawnBlock interface {
+	SpawnBlock() bool
+	Update(pos cube.Pos, u item.User, w *world.World)
+}


Please use proper grammer in the docs and also document the methods of the interface. Update is a very ambiguous name and doesn't hint towards being related to spawn points

You have changed the method name but the documentation is still needing to be updated

server/block/respawn_anchor.go

server/session/handler_player_action.go

server/world/sleep.go

server/world/viewer.go

server/player/player.go

TwistedAsylumMC

I have had another look, there are still unresolved comments that I have previously provided. I am not going to review this PR anymore until every single comment has been acted on or you've replied with a valid counter argument. I have gone through and resolved all the comments you have addressed but there are still many that remain

server/item/item.go

server/player/player.go

server/block/respawn_anchor.go

server/player/player.go

server/session/handler_player_action.go

server/block/bed.go

server/block/respawn_anchor.go

server/player/player.go

server/world/world.go

DaPigGuy · 2024-11-27T02:59:56Z

Please fix merge conflicts

FDUTCH · 2024-12-01T21:09:11Z

Please fix merge conflicts

bro , I'm dead ☠️
I don't know how to resolve merge conflict

# Conflicts: # server/player/handler.go # server/player/player.go # server/session/session.go # server/world/tick.go # server/world/world.go

xNatsuri

most of the pr looks good just from a quick glance saw this issue

server/block/bed.go

# Conflicts: # server/player/player.go # server/session/session.go

server/block/bed.go

server/block/register.go

server/block/bed.go

server/player/player.go

server/block/register.go

server/world/tick.go

server/player/player.go

DaPigGuy · 2025-01-13T07:31:23Z

server/block/respawn_anchor.go

+type RespawnAnchor struct {
+	solid
+	bassDrum
+	Charge int


Document this

server/block/respawn_anchor.go

server/block/bed.go

FDUTCH · 2025-01-13T16:15:29Z

after making Bed.Sleeper as *world.EntityHandle appeared dead locks when placing, breaking and sleeping

This reverts commit 737c961. I'm stupid

server/block/bed.go

nothing

TwistedAsylumMC

I have had another look over and found some inconsistencies with your implementation compared to vanilla, or at least what is documented on the wiki. If any of this is incorrect for Bedrock then I am happy to ignore those. There are also still multiple unresolved comments that myself and @DaPigGuy have left previously, please make sure you scroll through https://github.com/df-mc/dragonfly/pull/938/files and look at any unresolved comment and either make the requested changes or reply with a counter reason

TwistedAsylumMC · 2025-02-17T01:03:11Z

server/block/bed.go

+
+		sleeper := headSide.Sleeper
+		if sleeper != nil {
+


Unnecessary whitespace

TwistedAsylumMC · 2025-02-17T01:14:57Z

server/item/item.go

-	// MaxCount returns the maximum number of items that a stack may be composed of. The number returned must
+	// MaxCount returns the maximum number of items a stack may be composed of. The number returned must


This change is irrelevant, please remove it

TwistedAsylumMC · 2025-02-17T01:18:08Z

server/player/player.go

+// Sleep makes the player sleep at the given position. If the position does not map to a bed (specifically the head side),
+// the player will not sleep.
+func (p *Player) Sleep(pos cube.Pos) {
+


Unnecessary whitespace

TwistedAsylumMC · 2025-02-17T01:19:36Z

server/player/player.go

+	b.Sleeper = p.H()
+	tx.SetBlock(pos, b, nil)
+
+	tx.World().SetRequiredSleepDuration(time.Second * 5)


This should probably be time.Millisecond * 5050

A player sleeps in a bed for 101 in-game ticks, or 5.05 seconds before the time skips to the next day.

TwistedAsylumMC · 2025-02-17T01:23:24Z

server/block/bed.go

+	}
+
+	time := w.Time() % world.TimeFull
+	if (time < world.TimeNight || time >= world.TimeSunrise) && !tx.ThunderingAt(pos) {


This logic does not match the behaviour documented on the wiki:

A player sleeps by using a bed during a thunderstorm, or at night (between 12542 and 23459 ticks in clear weather, when stars appear in the sky, or between 12010 and 23991 ticks in rainy weather). Players can sleep during a thunderstorm even if they are in a biome where it does not rain (i.e. desert)

TwistedAsylumMC · 2025-02-17T01:27:26Z

server/player/player.go

+// spawnLocation returns position and world where player should be spawned.
+func (p *Player) spawnLocation() (playerSpawn cube.Pos, w *world.World, spawnBlockBroken bool, previousDimension world.Dimension) {
+	tx := p.tx
+	w = tx.World()
+	previousDimension = w.Dimension()
+	playerSpawn = w.PlayerSpawn(p.UUID())
+	if b, ok := tx.Block(playerSpawn).(block.RespawnBlock); ok && b.CanRespawnOn() {
+		return playerSpawn, w, false, previousDimension
+	}
+
+	// We can use the principle here that returning through a portal of a specific dimension inside that dimension will
+	// always bring us back to the overworld.
+	w = w.PortalDestination(w.Dimension())
+	worldSpawn := w.Spawn()
+	return worldSpawn, w, playerSpawn != worldSpawn, previousDimension
+}
+


This function does not return accurate spawn positions. block.RespawnBlock should have a method which returns the position where the player should respawn since it's not at the same place where the bed/respawn anchor is located.

https://minecraft.wiki/w/Bed#Setting_the_spawn_point
https://minecraft.wiki/w/Respawn_Anchor#Respawning

cjmustard · 2025-03-01T02:58:00Z

@TwistedAsylumMC are these changes above all that need to be altered before this PR is ready for master?

I might be able to get these done relatively quickly

FDUTCH added 5 commits November 17, 2024 22:02

implement beds , respawn anchors

88f1a8f

run go generate

41e2831

remove hash methods in the files

dea2dfd

fix github Staticcheck

198ddfc

remove useless comments

0f9d7a2

TwistedAsylumMC requested changes Nov 17, 2024

View reviewed changes

FDUTCH added 3 commits November 17, 2024 23:29

some fixes

20f6e1c

fix int to int32 casting

2c62bdb

requested changes

ffc6f69

TwistedAsylumMC requested changes Nov 18, 2024

View reviewed changes

requested changes

2ba7934

FDUTCH requested a review from TwistedAsylumMC November 20, 2024 23:39

TwistedAsylumMC requested changes Nov 21, 2024

View reviewed changes

DaPigGuy requested changes Nov 22, 2024

View reviewed changes

requested changes

5342bc8

DaPigGuy requested review from TwistedAsylumMC and DaPigGuy November 24, 2024 22:25

requested changes

c3ca7d0

FDUTCH added 4 commits December 2, 2024 14:24

Merge remote-tracking branch 'origin/master' into beds

a29517f

# Conflicts: # server/player/handler.go # server/player/player.go # server/session/session.go # server/world/tick.go # server/world/world.go

fix merge conflicts

7c87c40

fix build

6716f5d

fix formatting

bce0754

DaPigGuy mentioned this pull request Dec 15, 2024

Vanilla Minecraft Feature Tracking #566

Open

89 tasks

FDUTCH and others added 2 commits December 15, 2024 21:13

Merge branch 'master' into beds

5d575de

fix formatting

b0d783c

DaPigGuy requested review from Sandertv and removed request for DaPigGuy December 16, 2024 07:11

xNatsuri suggested changes Dec 16, 2024

View reviewed changes

server/block/bed.go Outdated Show resolved Hide resolved

FDUTCH added 2 commits December 23, 2024 15:30

Merge branch 'master' into beds

0c1faf7

# Conflicts: # server/player/player.go # server/session/session.go

fix merge & update to use the translation changes

1adb42f

FDUTCH requested a review from DaPigGuy December 23, 2024 15:38

fix merge

f884bfa

DaPigGuy added the feature New feature or request label Dec 29, 2024

DaPigGuy added this to the v0.11.0 milestone Jan 4, 2025

Merge branch 'master' into beds

ff3989d

DaPigGuy requested changes Jan 7, 2025

View reviewed changes

FDUTCH added 2 commits January 8, 2025 19:56

requested changes

107d256

use world.EntityHandle insted of world.Sleeper

8df259d

DaPigGuy reviewed Jan 13, 2025

View reviewed changes

server/block/register.go Outdated Show resolved Hide resolved

server/block/register.go Outdated Show resolved Hide resolved

DaPigGuy reviewed Jan 13, 2025

View reviewed changes

server/world/tick.go Outdated Show resolved Hide resolved

DaPigGuy reviewed Jan 13, 2025

View reviewed changes

FDUTCH added 3 commits January 13, 2025 13:27

requested changes

ff6a673

fix register.go

456aeed

fix names & Bed.Head trouble

737c961

Revert "fix names & Bed.Head trouble"

3cbaf46

This reverts commit 737c961. I'm stupid

DaPigGuy reviewed Jan 15, 2025

View reviewed changes

server/block/bed.go Outdated Show resolved Hide resolved

FDUTCH added 3 commits January 16, 2025 17:09

fix deadlocks

d6611c1

Merge branch 'master' into beds

726c857

nothing

Merge branch 'master' into beds

9265cf0

TwistedAsylumMC requested changes Feb 17, 2025

View reviewed changes

cjmustard added a commit to cjmustard/dragonfly that referenced this pull request Mar 1, 2025

https://github.com/df-mc/dragonfly/pull/938#discussion_r1957468152

a9de31d

cjmustard added a commit to cjmustard/dragonfly that referenced this pull request Mar 1, 2025

https://github.com/df-mc/dragonfly/pull/938#discussion_r1957472397

62f741b

cjmustard added a commit to cjmustard/dragonfly that referenced this pull request Mar 1, 2025

https://github.com/df-mc/dragonfly/pull/938#discussion_r1957473802

ce99213

cjmustard added a commit to cjmustard/dragonfly that referenced this pull request Mar 1, 2025

https://github.com/df-mc/dragonfly/pull/938#discussion_r1957474398

7f5cfd2

cjmustard added a commit to cjmustard/dragonfly that referenced this pull request Mar 1, 2025

https://github.com/df-mc/dragonfly/pull/938#discussion_r1957476433

368ab2d

cjmustard mentioned this pull request Mar 1, 2025

Implementation of Beds & Respawn Anchors (Continuation of PR #938) #1023

Closed

		// MaxCount returns the maximum number of items that a stack may be composed of. The number returned must
		// MaxCount returns the maximum number of items a stack may be composed of. The number returned must

implement beds , respawn anchors #938

Are you sure you want to change the base?

implement beds , respawn anchors #938

Uh oh!

Conversation

FDUTCH commented Nov 17, 2024

Uh oh!

TwistedAsylumMC left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TwistedAsylumMC left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

TwistedAsylumMC left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DaPigGuy commented Nov 27, 2024

Uh oh!

FDUTCH commented Dec 1, 2024

Uh oh!

xNatsuri left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xNatsuri left a comment •

edited

Loading