diff --git a/handlers/worlds/world.go b/handlers/worlds/world.go index 7854d1b..895cdd9 100644 --- a/handlers/worlds/world.go +++ b/handlers/worlds/world.go @@ -410,7 +410,8 @@ func (w *worldsHandler) SaveAndReset() { ld.Experiments["experiments_ever_used"] = true ld.Experiments["saved_with_toggled_experiments"] = true } - + ld.RandomTickSpeed = 0 + s.CurrentTick = 0 provider.SaveSettings(s) if err = provider.Close(); err != nil { logrus.Error(err) diff --git a/utils/behaviourpack/entity.go b/utils/behaviourpack/entity.go index 21642bf..d55c9dc 100644 --- a/utils/behaviourpack/entity.go +++ b/utils/behaviourpack/entity.go @@ -51,8 +51,6 @@ func (bp *BehaviourPack) AddEntity(entity EntityIn) { Events: nil, }, } - } else { - println() } for _, av := range entity.Attr { diff --git a/utils/nbtconv/write.go b/utils/nbtconv/write.go index 2279bdf..37e8f40 100644 --- a/utils/nbtconv/write.go +++ b/utils/nbtconv/write.go @@ -3,10 +3,11 @@ package nbtconv import ( "bytes" "encoding/gob" + "sort" + "github.com/df-mc/dragonfly/server/item" "github.com/df-mc/dragonfly/server/world" "github.com/df-mc/dragonfly/server/world/chunk" - "sort" ) // 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 { writeItemStack(m, s) } - writeDamage(m, s, disk) - writeAnvilCost(m, s) - writeDisplay(m, s) - writeEnchantments(m, s) + t := make(map[string]any) + writeDamage(t, s, disk) + writeAnvilCost(t, s) + writeDisplay(t, s) + writeEnchantments(t, s) + m["tag"] = t + writeDragonflyData(m, s) return m }