fix item metadata being written to the wrong key

This commit is contained in:
olebeck 2023-04-04 17:12:21 +02:00
parent 2996a752fc
commit a5f77eca3c
3 changed files with 11 additions and 8 deletions

View File

@ -410,7 +410,8 @@ func (w *worldsHandler) SaveAndReset() {
ld.Experiments["experiments_ever_used"] = true ld.Experiments["experiments_ever_used"] = true
ld.Experiments["saved_with_toggled_experiments"] = true ld.Experiments["saved_with_toggled_experiments"] = true
} }
ld.RandomTickSpeed = 0
s.CurrentTick = 0
provider.SaveSettings(s) provider.SaveSettings(s)
if err = provider.Close(); err != nil { if err = provider.Close(); err != nil {
logrus.Error(err) logrus.Error(err)

View File

@ -51,8 +51,6 @@ func (bp *BehaviourPack) AddEntity(entity EntityIn) {
Events: nil, Events: nil,
}, },
} }
} else {
println()
} }
for _, av := range entity.Attr { for _, av := range entity.Attr {

View File

@ -3,10 +3,11 @@ package nbtconv
import ( import (
"bytes" "bytes"
"encoding/gob" "encoding/gob"
"sort"
"github.com/df-mc/dragonfly/server/item" "github.com/df-mc/dragonfly/server/item"
"github.com/df-mc/dragonfly/server/world" "github.com/df-mc/dragonfly/server/world"
"github.com/df-mc/dragonfly/server/world/chunk" "github.com/df-mc/dragonfly/server/world/chunk"
"sort"
) )
// WriteItem encodes an item stack into a map that can be encoded using NBT. // WriteItem encodes an item stack into a map that can be encoded using NBT.
@ -20,10 +21,13 @@ func WriteItem(s item.Stack, disk bool) map[string]any {
if disk { if disk {
writeItemStack(m, s) writeItemStack(m, s)
} }
writeDamage(m, s, disk) t := make(map[string]any)
writeAnvilCost(m, s) writeDamage(t, s, disk)
writeDisplay(m, s) writeAnvilCost(t, s)
writeEnchantments(m, s) writeDisplay(t, s)
writeEnchantments(t, s)
m["tag"] = t
writeDragonflyData(m, s) writeDragonflyData(m, s)
return m return m
} }