implement beds , respawn anchors #938
Conversation
server/world/tick.go
Outdated
| t.w.set.RequiredSleepTicks-- | ||
| if t.w.set.RequiredSleepTicks-1 <= 0 { |
There was a problem hiding this comment.
Is this logic correct? You're decrementing the ticks and then checking if the tick below is <= 0?
server/block/bed.go
Outdated
| // 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) | ||
| } |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
You have changed the method name but the documentation is still needing to be updated
| @@ -23,14 +23,15 @@ func handlePlayerAction(action int32, face int32, pos protocol.BlockPos, entityR | |||
| return errSelfRuntimeID | |||
| } | |||
| switch action { | |||
| case protocol.PlayerActionRespawn, protocol.PlayerActionDimensionChangeDone: | |||
| // Don't do anything for these actions. | |||
There was a problem hiding this comment.
If you run go fmt over this file, does it bring back this spacing?
There was a problem hiding this comment.
Could you please commit that change?
server/world/sleep.go
Outdated
| UUID() uuid.UUID | ||
| Name() string | ||
|
|
||
| Message(a ...any) | ||
| Messaget(key string, a ...string) |
There was a problem hiding this comment.
Is it absolutely necessary for a sleeper to implement these methods?
There was a problem hiding this comment.
actually only some of them are not needed
There was a problem hiding this comment.
Could you remove any that are not needed?
There was a problem hiding this comment.
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
Outdated
| UUID() uuid.UUID | ||
|
|
||
| Messaget(key string, a ...string) | ||
| Sneaking() bool |
There was a problem hiding this comment.
This is still not resolved
server/player/player.go
Outdated
| // We have an actual client connected to this player: We change its position server side so that in | ||
| // the future, the client won't respawn on the death location when disconnecting. The client should | ||
| // not see the movement itself yet, though. | ||
| newPos := w.Spawn().Vec3() | ||
| p.pos.Store(&newPos) | ||
| pos, w, blockHasBeenBroken, _ := p.realSpawnPos() |
There was a problem hiding this comment.
I think "spawnObstructed" is a better name for this
server/block/respawn_anchor.go
Outdated
| // allRespawnAnchorsItems returns all possible respawn anchors as items. | ||
| func allRespawnAnchorsItems() []world.Item { | ||
| all := make([]world.Item, 0, 5) | ||
| for i := 0; i < 5; i++ { | ||
| all = append(all, RespawnAnchor{Charge: i}) | ||
| } | ||
| return all | ||
| } |
There was a problem hiding this comment.
Please remove this like I previously asked, just put this for loop in register.go for items specifically
server/player/player.go
Outdated
| // realSpawnPos returns position and world where player should be spawned. | ||
| func (p *Player) realSpawnPos() (pos cube.Pos, w *world.World, spawnBlockBroken bool, previousDimension world.Dimension) { | ||
| w = p.World() | ||
|
|
||
| previousDimension = w.Dimension() | ||
| pos = w.PlayerSpawn(p.UUID()) | ||
| if b, ok := w.Block(pos).(block.RespawnBlock); ok && b.CanSpawn() { | ||
| return pos, 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()) | ||
| return w.Spawn(), w, true, previousDimension | ||
| } |
There was a problem hiding this comment.
The name and documentation for this method is slightly misleading since nowhere does it state it actually calls w.Spawn()
There was a problem hiding this comment.
ok, I'll call this function ¨spawnLocation¨
| @@ -23,14 +23,15 @@ func handlePlayerAction(action int32, face int32, pos protocol.BlockPos, entityR | |||
| return errSelfRuntimeID | |||
| } | |||
| switch action { | |||
| case protocol.PlayerActionRespawn, protocol.PlayerActionDimensionChangeDone: | |||
| // Don't do anything for these actions. | |||
There was a problem hiding this comment.
Could you please commit that change?
| for _, d := range cube.Directions() { | ||
| beds = append(beds, Bed{Facing: d}) | ||
| beds = append(beds, Bed{Facing: d, Head: true}) | ||
| } |
There was a problem hiding this comment.
Not having the occupied block states registered might be problematic?
There was a problem hiding this comment.
I think the problem is that colored versions were not taken into account?
There was a problem hiding this comment.
Bed color is set through the tile, not a block state. Please undo your change.
If all beds are white in the creative inventory, it is probably the same issue with the creative item entries missing NBT that banners have. See a1c98da
server/player/player.go
Outdated
| vec := pos.Vec3() | ||
|
|
||
| if blockHasBeenBroken { | ||
| p.Handler().HandleRespawn(&vec, &w) |
There was a problem hiding this comment.
This is a misuse of the respawn event. The player is not actually respawning at this point. If you would like to be able to change the respawn world, make a new event, i.e. respawn change.
There was a problem hiding this comment.
¨make a new event, i.e. respawn change¨ this can bee done using custom world.Provider
There was a problem hiding this comment.
The respawn event should not be emitted here. The player is not actually respawning here.
There was a problem hiding this comment.
soo, should I remove the event call from this function?
|
Please fix merge conflicts |
No description provided.