From 24241749b5e5f49708fb73d0a17a21235172955d Mon Sep 17 00:00:00 2001 From: JavierLeon9966 <58715544+JavierLeon9966@users.noreply.github.com> Date: Tue, 21 Jul 2026 16:45:14 -0300 Subject: [PATCH] Remove bamboo reliability exception --- go.mod | 3 +-- go.sum | 12 ++++++------ simulation.go | 18 ++---------------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index b7cf8b4..96ede50 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,9 @@ require ( github.com/chewxy/math32 v1.11.1 github.com/df-mc/dragonfly v0.10.11-0.20260721135200-3e3556bddb5f github.com/go-gl/mathgl v1.2.0 - github.com/sandertv/gophertunnel v1.57.0 + github.com/sandertv/gophertunnel v1.57.2-0.20260720171832-1706d533aa80 ) - require ( github.com/brentp/intintmap v0.0.0-20251106190759-56907b1f8479 // indirect github.com/df-mc/goleveldb v1.1.9 // indirect diff --git a/go.sum b/go.sum index 3ede9ef..a108a85 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/brentp/intintmap v0.0.0-20251106190759-56907b1f8479 h1:UZbbt19ACBOFO+ github.com/brentp/intintmap v0.0.0-20251106190759-56907b1f8479/go.mod h1:TOk10ahXejq9wkEaym3KPRNeuR/h5Jx+s8QRWIa2oTM= github.com/chewxy/math32 v1.11.1 h1:b7PGHlp8KjylDoU8RrcEsRuGZhJuz8haxnKfuMMRqy8= github.com/chewxy/math32 v1.11.1/go.mod h1:dOB2rcuFrCn6UHrze36WSLVPKtzPMRAQvBvUwkSsLqs= +github.com/df-mc/dragonfly v0.10.11-0.20260721135200-3e3556bddb5f h1:3fOtzXVIEsci6+Nayy+R/glF053UdQq2sRtHdQdinrs= +github.com/df-mc/dragonfly v0.10.11-0.20260721135200-3e3556bddb5f/go.mod h1:NGnnP9U+QN2NeTfl+Ul2NvVvVbDaRTEgcMS2Gz9dpzA= github.com/df-mc/goleveldb v1.1.9 h1:ihdosZyy5jkQKrxucTQmN90jq/2lUwQnJZjIYIC/9YU= github.com/df-mc/goleveldb v1.1.9/go.mod h1:+NHCup03Sci5q84APIA21z3iPZCuk6m6ABtg4nANCSk= github.com/df-mc/worldupgrader v1.0.21 h1:Qr4/QB8ek7En0vkTuRXYq4FrZM0HHSOXsJOL7Ko4Cjg= @@ -15,8 +17,6 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashimthearab/dragonfly v0.0.0-20260721043247-e11e4f6ede86 h1:Mk87hJwo3XaqjOKeKkN6+eBkWIZZmKIOzY3/jHoeEWw= -github.com/hashimthearab/dragonfly v0.0.0-20260721043247-e11e4f6ede86/go.mod h1:qZwpBcuVNCqHg8Nj6gec5bG+5LrBYPok1k7FKDQQrng= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= @@ -27,8 +27,8 @@ github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/sandertv/gophertunnel v1.57.0 h1:UkgVg1xLCsOSm79rP09WmodGSHgA8M7+l4quL01cIL8= -github.com/sandertv/gophertunnel v1.57.0/go.mod h1:W4VnrX9AIPIVXNDMEIKMIRj1T80EdOgdqXpGbQpyAbE= +github.com/sandertv/gophertunnel v1.57.2-0.20260720171832-1706d533aa80 h1:epvVbD9bZVnPDXFcQE6YAufexj3MhcpBWlEIuGPJDek= +github.com/sandertv/gophertunnel v1.57.2-0.20260720171832-1706d533aa80/go.mod h1:Frjuk3g1EEGRYjzyrEMS4j/hDvTcez2STfuRHkRPlNU= github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= golang.org/x/exp v0.0.0-20260611194520-c48552f49976 h1:X8Hz2ImujgbmetVuW+w2YkyZChE3cBpZi2P158rTG9M= @@ -49,5 +49,5 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/simulation.go b/simulation.go index d6427dd..eea3cbd 100644 --- a/simulation.go +++ b/simulation.go @@ -1,9 +1,10 @@ package bedsim import ( - "github.com/chewxy/math32" "iter" + "github.com/chewxy/math32" + "github.com/df-mc/dragonfly/server/block" "github.com/df-mc/dragonfly/server/block/cube" "github.com/df-mc/dragonfly/server/world" @@ -454,21 +455,6 @@ func (s *Simulator) simulationIsReliable(state *MovementState) bool { return true } - stateBB := state.BoundingBox(s.Options.UseSlideOffset) - isReliable := true - for _, b := range nearbyBlocks(stateBB.Grow(1), s.World) { - if _, isAir := b.(block.Air); isAir { - continue - } - if s.blockName(b) == "minecraft:bamboo" { - isReliable = false - break - } - } - if !isReliable { - return false - } - if state.GameMode != packet.GameTypeSurvival && state.GameMode != packet.GameTypeAdventure { return false }