Skip to content

structure.go: Use worldupgrader to upgrade blocks to their latest version #2

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
nguynkhn wants to merge 3 commits into
base: master
Choose a base branch
from
Open

structure.go: Use worldupgrader to upgrade blocks to their latest version #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89922cb
structure.go: Use `worldupgrader` to upgrade blocks to their latest v…
nguynkhn Jul 1, 2025
c38a8e6
update to the latest version of dragonfly
nguynkhn Jul 1, 2025
9797eb2
Merge branch 'master' into master
nguynkhn Feb 5, 2026
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
10 changes: 9 additions & 1 deletion structure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ package schematic

import (
"fmt"
"maps"
"math"
"reflect"

"github.com/df-mc/dragonfly/server/block"
"github.com/df-mc/dragonfly/server/world"
"github.com/df-mc/worldupgrader/blockupgrader"
)

// schematic implements the structure of a Schematic, providing methods to read from it.
Expand Down Expand Up @@ -69,7 +71,13 @@ func (s *schematic) At(x, y, z int, _ func(int, int, int) world.Block) (world.Bl
if !ok {
return block.Air{}, nil
}
ret, ok := world.BlockByName(n.name, n.properties)

u := blockupgrader.Upgrade(blockupgrader.BlockState{
Name: n.name,
Properties: maps.Clone(n.properties),
})

ret, ok := world.BlockByName(u.Name, u.Properties)
if !ok {
return block.Air{}, nil
}
Expand Down