aboutsummaryrefslogtreecommitdiff
path: root/process.go
diff options
context:
space:
mode:
authorHimbeer <himbeer@disroot.org>2024-08-23 11:46:19 +0200
committerHimbeer <himbeer@disroot.org>2024-08-23 11:46:19 +0200
commit53d8cfd7d042c45ccc78f82d3c4b3f2fc8272c7f (patch)
tree7f91b1a95c5e72d11aab978ee614d5e973674f63 /process.go
parentefeceb162b2fd45994bf09023eea065519b6b89b (diff)
Update to Minetest 5.9
Closes #148.
Diffstat (limited to 'process.go')
-rw-r--r--process.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/process.go b/process.go
index b381a54..8144062 100644
--- a/process.go
+++ b/process.go
@@ -648,9 +648,11 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
return
case *mt.ToCltInv:
var oldInv mt.Inv
- copy(oldInv, sc.inv)
+ oldB := &strings.Builder{}
+ sc.inv.Serialize(oldB)
+ oldInv.Deserialize(strings.NewReader(oldB.String()))
sc.inv.Deserialize(strings.NewReader(cmd.Inv))
- sc.prependInv(sc.inv)
+ sc.prependInvKeep(sc.inv, oldInv)
handStack := mt.Stack{
Item: mt.Item{
@@ -814,7 +816,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
}
}
case *mt.ToCltSpawnParticle:
- prependTexture(sc.mediaPool, &cmd.Texture)
+ prependTexture(sc.mediaPool, &cmd.TextureName)
sc.globalParam0(&cmd.NodeParam0)
case *mt.ToCltBlkData:
for i := range cmd.Blk.Param0 {
@@ -833,7 +835,7 @@ func (sc *ServerConn) process(pkt mt.Pkt) {
case *mt.ToCltAddNode:
sc.globalParam0(&cmd.Node.Param0)
case *mt.ToCltAddParticleSpawner:
- prependTexture(sc.mediaPool, &cmd.Texture)
+ prependTexture(sc.mediaPool, &cmd.TextureName)
sc.swapAOID(&cmd.AttachedAOID)
sc.globalParam0(&cmd.NodeParam0)
sc.particleSpawners[cmd.ID] = struct{}{}