From c73b97624641c3ab14b5e3c1ec7d9880fc0abd97 Mon Sep 17 00:00:00 2001 From: olebeck <31539311+olebeck@users.noreply.github.com> Date: Fri, 2 Sep 2022 18:20:06 +0200 Subject: [PATCH] fix small render bug --- chunk_render.go | 15 ++++++++++++--- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/chunk_render.go b/chunk_render.go index e3622f9..cf9a410 100644 --- a/chunk_render.go +++ b/chunk_render.go @@ -14,6 +14,9 @@ func chunkGetColorAt(c *chunk.Chunk, x uint8, y int16, z uint8) color.RGBA { p := cube.Pos{int(x), int(y), int(z)} have_up := false p.Side(cube.FaceUp).Neighbours(func(neighbour cube.Pos) { + if neighbour.X() < 0 || neighbour.X() >= 16 || neighbour.Z() < 0 || neighbour.Z() >= 16 { + return + } if !have_up { block_rid := c.Block(uint8(neighbour[0]), int16(neighbour[1]), uint8(neighbour[2]), 0) b, found := world.BlockByRuntimeID(block_rid) @@ -46,9 +49,15 @@ func chunkGetColorAt(c *chunk.Chunk, x uint8, y int16, z uint8) color.RGBA { } if have_up { - col.R -= 10 - col.G -= 10 - col.B -= 10 + if col.R > 10 { + col.R -= 10 + } + if col.G > 10 { + col.G -= 10 + } + if col.B > 10 { + col.B -= 10 + } } return col } diff --git a/go.mod b/go.mod index d6bae47..6b52f38 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( replace github.com/sandertv/gophertunnel => github.com/olebeck/gophertunnel v1.24.8-3 -replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.8.2-6 +replace github.com/df-mc/dragonfly => github.com/olebeck/dragonfly v0.8.3-0.20220902161600-2f9b3652bbb7 require ( github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9 // indirect diff --git a/go.sum b/go.sum index 7173809..6a8c162 100644 --- a/go.sum +++ b/go.sum @@ -43,6 +43,8 @@ github.com/olebeck/dragonfly v0.8.2-5 h1:0G9dhTQ1Oae1KnmgRjNeqYPQ/PsLFGwMWtQYAJk github.com/olebeck/dragonfly v0.8.2-5/go.mod h1:xgpCDhHoP03RygPaTrzzDwsSTcEZhxNPMV3CAxETj+I= github.com/olebeck/dragonfly v0.8.2-6 h1:h7GoXbNMS1OTOfm/QK7QQ3VF4By5Scfk/7Sd0LJ13s0= github.com/olebeck/dragonfly v0.8.2-6/go.mod h1:xgpCDhHoP03RygPaTrzzDwsSTcEZhxNPMV3CAxETj+I= +github.com/olebeck/dragonfly v0.8.3-0.20220902161600-2f9b3652bbb7 h1:/JD6mWd0/hPcCEvLNB/GGJhqhMBHYV1Hce5vyM9Wy2s= +github.com/olebeck/dragonfly v0.8.3-0.20220902161600-2f9b3652bbb7/go.mod h1:ObfYlB77fxGLqU2CLquvk8ibAEMYoixiXfs7pxrOGCI= github.com/olebeck/gophertunnel v1.24.6 h1:Mnpzk9e+eMdfx/wbEsmwQabEbalNzFRu+3iMEBzaVSg= github.com/olebeck/gophertunnel v1.24.6/go.mod h1:dMOw79FHxr2azEqiGH20AwdljisAN1kqwu5SjPBnZ5k= github.com/olebeck/gophertunnel v1.24.7 h1:EMYLDMxGxzPtoI/Y77KHPcfelkGS+QcjdtStGIqtYFE=