Skip to content

Handle block entities with nil nbt #1100

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
Flonja wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle block entities with nil nbt #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions server/session/chunk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ func (s *Session) subChunkEntry(offset protocol.SubChunkOffset, ind int16, col *
for pos, b := range col.BlockEntities {
if n, ok := b.(world.NBTer); ok && col.Chunk.SubIndex(int16(pos.Y())) == ind {
d := n.EncodeNBT()
if d == nil {
continue
}
d["x"], d["y"], d["z"] = int32(pos[0]), int32(pos[1]), int32(pos[2])
_ = enc.Encode(d)
}
Expand Down Expand Up @@ -178,6 +181,9 @@ func (s *Session) sendBlobHashes(pos world.ChunkPos, dim world.Dimension, c *chu
for bp, b := range blockEntities {
if n, ok := b.(world.NBTer); ok {
d := n.EncodeNBT()
if d == nil {
continue
}
d["x"], d["y"], d["z"] = int32(bp[0]), int32(bp[1]), int32(bp[2])
_ = enc.Encode(d)
}
Expand Down Expand Up @@ -220,6 +226,9 @@ func (s *Session) sendNetworkChunk(pos world.ChunkPos, dim world.Dimension, c *c
for bp, b := range blockEntities {
if n, ok := b.(world.NBTer); ok {
d := n.EncodeNBT()
if d == nil {
continue
}
d["x"], d["y"], d["z"] = int32(bp[0]), int32(bp[1]), int32(bp[2])
_ = enc.Encode(d)
}
Expand Down
3 changes: 3 additions & 0 deletions server/world/mcdb/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,9 @@ func (db *DB) storeBlockEntities(batch *leveldb.Batch, k dbKey, blockEntities []
buf := bytes.NewBuffer(nil)
enc := nbt.NewEncoderWithEncoding(buf, nbt.LittleEndian)
for _, b := range blockEntities {
if b.Data == nil {
continue
}
b.Data["x"], b.Data["y"], b.Data["z"] = int32(b.Pos[0]), int32(b.Pos[1]), int32(b.Pos[2])
if err := enc.Encode(b.Data); err != nil {
db.conf.Log.Error("store block entities: encode nbt: " + err.Error())
Expand Down