这是indexloc提供的服务，不要输入任何密码
Skip to content

refactor: add conn.Disconnect and update listener.Disconnect to use that #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

refactor: add conn.Disconnect and update listener.Disconnect to use that #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b709ce
Added missing chemistry packs
JavierLeon9966 Sep 15, 2025
9df8254
Format list based on the versions
JavierLeon9966 Sep 16, 2025
244e0f6
Merge pull request #33 from JavierLeon9966/fix/missing-packs
HashimTheArab Oct 17, 2025
6139bb9
Merge branch 'Sandertv:master' into master
HashimTheArab Oct 26, 2025
17eb630
refactor: add conn.Disconnect and update listener.Disconnect to use that
HashimTheArab Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions minecraft/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,17 @@ func (conn *Conn) Context() context.Context {
return conn.ctx
}

// Disconnect disconnects the connection by first sending a disconnect packet with the message passed, and
// closing the connection after. If the message passed is empty, the client will be immediately sent to the
// server list instead of a disconnect screen.
func (conn *Conn) Disconnect(message string) error {
_ = conn.WritePacket(&packet.Disconnect{
HideDisconnectionScreen: message == "",
Message: message,
})
Comment on lines +584 to +587
Copy link
Owner

@Sandertv Sandertv Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sends a Disconnect packet to the server if it is a client connection. That is not a logical change.

return conn.close(conn.closeErr(message))
}

// takeDeferredPacket locks the deferred packets lock and takes the next packet from the list of deferred
// packets. If none was found, it returns false, and if one was found, the data and true is returned.
func (conn *Conn) takeDeferredPacket() (*packetData, bool) {
Expand Down
17 changes: 7 additions & 10 deletions minecraft/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,19 @@ import (
"crypto/rand"
"errors"
"fmt"
"github.com/sandertv/gophertunnel/minecraft/internal"
"github.com/sandertv/gophertunnel/minecraft/protocol"
"github.com/sandertv/gophertunnel/minecraft/protocol/login"
"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
"github.com/sandertv/gophertunnel/minecraft/resource"
"log/slog"
"math"
"net"
"slices"
"sync"
"sync/atomic"
"time"

"github.com/sandertv/gophertunnel/minecraft/internal"
"github.com/sandertv/gophertunnel/minecraft/protocol"
"github.com/sandertv/gophertunnel/minecraft/protocol/login"
"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
"github.com/sandertv/gophertunnel/minecraft/resource"
)

// ListenConfig holds settings that may be edited to change behaviour of a Listener.
Expand Down Expand Up @@ -187,11 +188,7 @@ func (listener *Listener) Accept() (net.Conn, error) {
// closing the connection after. If the message passed is empty, the client will be immediately sent to the
// server list instead of a disconnect screen.
func (listener *Listener) Disconnect(conn *Conn, message string) error {
_ = conn.WritePacket(&packet.Disconnect{
HideDisconnectionScreen: message == "",
Message: message,
})
return conn.close(conn.closeErr(message))
return conn.Disconnect(message)
}

// AddResourcePack adds a new resource pack to the listener's resource packs.
Expand Down