world/block.go: Fix incorrect unknownBlock hash checking

TwistedAsylumMC · TwistedAsylumMC · commit ae7c8eda2d8e · 2024-09-09T09:48:16.000+01:00
diff --git a/server/world/block.go b/server/world/block.go
@@ -181,9 +181,9 @@ func BlockRuntimeID(b Block) uint32 {
 	if b == nil {
 		return airRID
 	}
-	if h := BlockHash(b); h != math.MaxUint64 {
+	if _, h := b.Hash(); h != math.MaxUint64 {
 		// b is not an unknownBlock.
-		if rid, ok := hashes.Get(int64(h)); ok {
+		if rid, ok := hashes.Get(int64(BlockHash(b))); ok {
 			return uint32(rid)
 		}
 		panic(fmt.Sprintf("cannot find block by non-0 hash of block %#v", b))

Original file line number	Diff line number	Diff line change
`@@ -181,9 +181,9 @@ func BlockRuntimeID(b Block) uint32 {`
`181`	`181`	`if b == nil {`
`182`	`182`	`return airRID`
`183`	`183`	`}`
`184`		`- if h := BlockHash(b); h != math.MaxUint64 {`
	`184`	`+ if _, h := b.Hash(); h != math.MaxUint64 {`
`185`	`185`	`// b is not an unknownBlock.`
`186`		`- if rid, ok := hashes.Get(int64(h)); ok {`
	`186`	`+ if rid, ok := hashes.Get(int64(BlockHash(b))); ok {`
`187`	`187`	`return uint32(rid)`
`188`	`188`	`}`
`189`	`189`	`panic(fmt.Sprintf("cannot find block by non-0 hash of block %#v", b))`