Fix register(critical)?untilLatest being inverted
This commit is contained in:
+4
-4
@@ -130,10 +130,10 @@ func LoginRaw(c *proto.Conn, account *api.Account, addr string) (err error) {
|
||||
}
|
||||
lc.RegisterCritical(lc.OnDefault)
|
||||
lc.RegisterCritical(lc.OnClose)
|
||||
lc.RegisterUntilLatest(lc.OnCompress)
|
||||
lc.RegisterUntilLatest(lc.OnEncrypt)
|
||||
lc.RegisterUntilLatest(lc.OnDisconnect)
|
||||
lc.RegisterUntilLatest(lc.OnSuccess)
|
||||
lc.RegisterCriticalUntilLatest(lc.OnCompress)
|
||||
lc.RegisterCriticalUntilLatest(lc.OnEncrypt)
|
||||
lc.RegisterCriticalUntilLatest(lc.OnDisconnect)
|
||||
lc.RegisterCriticalUntilLatest(lc.OnSuccess)
|
||||
|
||||
p, err := MakeHandshakePacket(lc.Conn, proto_base.Login)
|
||||
if err != nil {
|
||||
|
||||
@@ -125,9 +125,9 @@ func (c *Conn) registerUntil(h any, until string, critical bool) {
|
||||
return v.Interface().(error)
|
||||
}
|
||||
if critical {
|
||||
c.RegisterCustomType(newT, reflect.ValueOf(handleFunc))
|
||||
} else {
|
||||
c.RegisterDirect(newT, reflect.ValueOf(handleFunc))
|
||||
} else {
|
||||
c.RegisterCustomType(newT, reflect.ValueOf(handleFunc))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -161,11 +161,11 @@ func ServeLogin(c *proto.Conn, settings ...LoginServerSetting) (ret *LoginServer
|
||||
ret = &LoginServer{Conn: c}
|
||||
ret.RegisterCritical(ret.OnDefault)
|
||||
ret.RegisterIgnore(event.Close{})
|
||||
ret.RegisterUntilLatest(ret.OnHandshake)
|
||||
ret.RegisterUntilLatest(ret.OnLoginStart)
|
||||
ret.RegisterUntilLatest(ret.OnLoginAcknowledged)
|
||||
ret.RegisterUntilLatest(ret.OnStatusRequest)
|
||||
ret.RegisterUntilLatest(ret.OnStatusPing)
|
||||
ret.RegisterCriticalUntilLatest(ret.OnHandshake)
|
||||
ret.RegisterCriticalUntilLatest(ret.OnLoginStart)
|
||||
ret.RegisterCriticalUntilLatest(ret.OnLoginAcknowledged)
|
||||
ret.RegisterCriticalUntilLatest(ret.OnStatusRequest)
|
||||
ret.RegisterCriticalUntilLatest(ret.OnStatusPing)
|
||||
for _, s := range settings {
|
||||
s(ret)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user