falloutBot/go-mc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace latency packet id name usage

Browse Source
This commit is contained in:
Tnze
2024-06-16 16:41:53 +08:00
parent de10351a91
commit 5f5db75a34
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/login.go
View File

@ -96,8 +96,8 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
if err != nil {
return
}
if packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginStart {
err = wrongPacketErr{expect: int32(packetid.ServerboundLoginStart), get: p.ID}
if packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginHello {
err = wrongPacketErr{expect: int32(packetid.ServerboundLoginHello), get: p.ID}
return
}
@ -133,7 +133,7 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
// set compression
if d.Threshold >= 0 {
err = conn.WritePacket(pk.Marshal(
packetid.ClientboundLoginCompression,
packetid.ClientboundLoginLoginCompression,
pk.VarInt(d.Threshold),
))
if err != nil {
@ -152,7 +152,7 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
}
// send login success
err = conn.WritePacket(pk.Marshal(
packetid.ClientboundLoginSuccess,
packetid.ClientboundLoginGameProfile,
pk.UUID(id),
pk.String(name),
pk.Array(properties),
@ -163,8 +163,8 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
// receive login ack
err = conn.ReadPacket(&p)
if err == nil && packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginAcknowledged {
err = wrongPacketErr{expect: int32(packetid.ServerboundLoginAcknowledged), get: p.ID}
if err == nil && packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginLoginAcknowledged {
err = wrongPacketErr{expect: int32(packetid.ServerboundLoginLoginAcknowledged), get: p.ID}
}
return
}