Skip to content

pass error in ProcessTransferFailure #30

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

Open
FDUTCH wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pass error in ProcessTransferFailure #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions session/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ type Processor interface {
// ProcessPreTransfer is called before transferring the player to a different server.
ProcessPreTransfer(ctx *Context, origin *string, target *string)
// ProcessTransferFailure is called when the player transfer to a different server fails.
ProcessTransferFailure(ctx *Context, origin *string, target *string)
ProcessTransferFailure(ctx *Context, origin *string, target *string, err error)
// ProcessPostTransfer is called after transferring the player to a different server.
ProcessPostTransfer(ctx *Context, origin *string, target *string)
// ProcessCache is called before updating the session's cache.
Expand All @@ -57,14 +57,14 @@ type NopProcessor struct{}
// Ensure that NopProcessor satisfies the Processor interface.
var _ Processor = NopProcessor{}

func (NopProcessor) ProcessStartGame(_ *Context, _ *minecraft.GameData) {}
func (NopProcessor) ProcessServer(_ *Context, _ *packet.Packet) {}
func (NopProcessor) ProcessServerEncoded(_ *Context, _ *[]byte) {}
func (NopProcessor) ProcessClient(_ *Context, _ *packet.Packet) {}
func (NopProcessor) ProcessClientEncoded(_ *Context, _ *[]byte) {}
func (NopProcessor) ProcessFlush(_ *Context) {}
func (NopProcessor) ProcessPreTransfer(_ *Context, _ *string, _ *string) {}
func (NopProcessor) ProcessTransferFailure(_ *Context, _ *string, _ *string) {}
func (NopProcessor) ProcessPostTransfer(_ *Context, _ *string, _ *string) {}
func (NopProcessor) ProcessCache(_ *Context, _ *[]byte) {}
func (NopProcessor) ProcessDisconnection(_ *Context, _ *string) {}
func (NopProcessor) ProcessStartGame(_ *Context, _ *minecraft.GameData) {}
func (NopProcessor) ProcessServer(_ *Context, _ *packet.Packet) {}
func (NopProcessor) ProcessServerEncoded(_ *Context, _ *[]byte) {}
func (NopProcessor) ProcessClient(_ *Context, _ *packet.Packet) {}
func (NopProcessor) ProcessClientEncoded(_ *Context, _ *[]byte) {}
func (NopProcessor) ProcessFlush(_ *Context) {}
func (NopProcessor) ProcessPreTransfer(_ *Context, _ *string, _ *string) {}
func (NopProcessor) ProcessTransferFailure(_ *Context, _ *string, _ *string, _ error) {}
func (NopProcessor) ProcessPostTransfer(_ *Context, _ *string, _ *string) {}
func (NopProcessor) ProcessCache(_ *Context, _ *[]byte) {}
func (NopProcessor) ProcessDisconnection(_ *Context, _ *string) {}
8 changes: 4 additions & 4 deletions session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,26 +164,26 @@ func (s *Session) TransferContext(ctx context.Context, addr string) (err error)
s.sendMetadata(true)
conn, err := s.dial(ctx, addr)
if err != nil {
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr)
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr, err)
return fmt.Errorf("dialer failed: %w", err)
}

if err := conn.DoConnect(); err != nil {
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr)
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr, err)
return fmt.Errorf("connection sequence failed failed: %w", err)
}

conn.OnConnect(func(err error) {
if err != nil {
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr)
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr, err)
return
}

gameData := conn.GameData()
s.animation.Play(s.client, gameData)
s.sendGameData(conn.GameData())
if err := conn.DoSpawn(); err != nil {
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr)
s.Processor().ProcessTransferFailure(NewContext(), &origin, &addr, err)
return
}
s.inFallback.Store(false)
Expand Down