5.5.x: don't redundantly compress node meta

3 files changed, 0 insertions, 28 deletions

diff --git a/deserialize.fmt b/deserialize.fmt
index 2e5ce49..1274cff 100644
--- a/deserialize.fmt
+++ b/deserialize.fmt
@@ -42,9 +42,6 @@ AOMsg	{
 image/color.NRGBA	*p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)}
 
 map[uint16]*NodeMeta	{
-		r, err := zlib.NewReader(byteReader{r})
-		chk(err)
-
 		switch ver := read8(r); ver {
 		case 0:
 			*p = nil
@@ -60,14 +57,9 @@ map[uint16]*NodeMeta	{
 		default:
 			chk(fmt.Errorf("unsupported nodemetas version: %d", ver))
 		}
-
-		chk(r.Close())
 	}
 
 map[[3]int16]*NodeMeta	{
-		r, err := zlib.NewReader(byteReader{r})
-		chk(err)
-
 		switch ver := read8(r); ver {
 		case 0:
 			*p = nil
@@ -86,8 +78,6 @@ map[[3]int16]*NodeMeta	{
 		default:
 			chk(fmt.Errorf("unsupported nodemetas version: %d", ver))
 		}
-
-		chk(r.Close())
 	}
 
 PointedThing	{
diff --git a/serialize.fmt b/serialize.fmt
index d021217..90232c8 100644
--- a/serialize.fmt
+++ b/serialize.fmt
@@ -45,8 +45,6 @@ AOMsg	writeAOMsg(w, x)
 image/color.NRGBA	w.Write([]byte{x.A, x.R, x.G, x.B})
 
 map[uint16]*NodeMeta	{
-		w := zlib.NewWriter(w)
-
 		if x == nil {
 			write8(w, 0)
 		} else {
@@ -80,13 +78,9 @@ map[uint16]*NodeMeta	{
 				chk(serialize(w, x[key]))
 			}
 		}
-
-		chk(w.Close())
 	}
 
 map[[3]int16]*NodeMeta	{
-		w := zlib.NewWriter(w)
-
 		if x == nil {
 			write8(w, 0)
 		} else {
@@ -120,8 +114,6 @@ map[[3]int16]*NodeMeta	{
 				chk(serialize(w, x[key]))
 			}
 		}
-
-		chk(w.Close())
 	}
 
 PointedThing	chk(writePointedThing(w, x))
diff --git a/serialize.go b/serialize.go
index 78c5bda..c0c84b3 100644
--- a/serialize.go
+++ b/serialize.go
@@ -13049,7 +13049,6 @@ func (obj *ToCltNodeMetasChanged) serialize(w io.Writer) {
 				Changed map[[3]int16]*NodeMeta
 			}))(obj)).Changed
 			{
-				w := zlib.NewWriter(w)
 				if x == nil {
 					write8(w, 0)
 				} else {
@@ -13081,7 +13080,6 @@ func (obj *ToCltNodeMetasChanged) serialize(w io.Writer) {
 						chk(serialize(w, x[key]))
 					}
 				}
-				chk(w.Close())
 			}
 		}
 		{
@@ -13116,8 +13114,6 @@ func (obj *ToCltNodeMetasChanged) deserialize(r io.Reader) {
 				Changed map[[3]int16]*NodeMeta
 			}))(obj)).Changed
 			{
-				r, err := zlib.NewReader(byteReader{r})
-				chk(err)
 				switch ver := read8(r); ver {
 				case 0:
 					*p = nil
@@ -13136,7 +13132,6 @@ func (obj *ToCltNodeMetasChanged) deserialize(r io.Reader) {
 				default:
 					chk(fmt.Errorf("unsupported nodemetas version: %d", ver))
 				}
-				chk(r.Close())
 			}
 		}
 		if r.N > 0 {
@@ -23913,7 +23908,6 @@ func (obj *MapBlk) serialize(w io.Writer) {
 			NodeMetas map[uint16]*NodeMeta
 		}))(obj)).NodeMetas
 		{
-			w := zlib.NewWriter(w)
 			if x == nil {
 				write8(w, 0)
 			} else {
@@ -23944,7 +23938,6 @@ func (obj *MapBlk) serialize(w io.Writer) {
 					chk(serialize(w, x[key]))
 				}
 			}
-			chk(w.Close())
 		}
 	}
 	{
@@ -24079,8 +24072,6 @@ func (obj *MapBlk) deserialize(r io.Reader) {
 			NodeMetas map[uint16]*NodeMeta
 		}))(obj)).NodeMetas
 		{
-			r, err := zlib.NewReader(byteReader{r})
-			chk(err)
 			switch ver := read8(r); ver {
 			case 0:
 				*p = nil
@@ -24096,7 +24087,6 @@ func (obj *MapBlk) deserialize(r io.Reader) {
 			default:
 				chk(fmt.Errorf("unsupported nodemetas version: %d", ver))
 			}
-			chk(r.Close())
 		}
 	}
 	{