Adapt to proxy API change: Server slice => map
parent
6be6655f33
commit
42e5a2973e
|
@ -104,15 +104,7 @@ func init() {
|
|||
return usage()
|
||||
}
|
||||
|
||||
var found bool
|
||||
for _, srv := range proxy.Conf().Servers {
|
||||
if srv.Name == args[1] {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
if _, ok := proxy.Conf().Servers[args[1]]; !ok {
|
||||
return "Server does not exist."
|
||||
}
|
||||
|
||||
|
@ -180,10 +172,6 @@ func init() {
|
|||
Usage: "players",
|
||||
Handler: func(cc *proxy.ClientConn, w io.Writer, args ...string) string {
|
||||
srvs := make(map[string][]*proxy.ClientConn)
|
||||
for _, srv := range proxy.Conf().Servers {
|
||||
srvs[srv.Name] = []*proxy.ClientConn{}
|
||||
}
|
||||
|
||||
for clt := range proxy.Clts() {
|
||||
srv := clt.ServerName()
|
||||
srvs[srv] = append(srvs[srv], clt)
|
||||
|
@ -321,9 +309,9 @@ func init() {
|
|||
return "Usage: server [server]"
|
||||
}
|
||||
|
||||
srvs := make([]string, len(proxy.Conf().Servers))
|
||||
for i, srv := range proxy.Conf().Servers {
|
||||
srvs[i] = srv.Name
|
||||
srvs := make([]string, 0, len(proxy.Conf().Servers))
|
||||
for name := range proxy.Conf().Servers {
|
||||
srvs = append(srvs, name)
|
||||
}
|
||||
|
||||
if cc == nil {
|
||||
|
@ -337,15 +325,7 @@ func init() {
|
|||
return "Telnet usage: server"
|
||||
}
|
||||
|
||||
var found bool
|
||||
for _, srv := range proxy.Conf().Servers {
|
||||
if srv.Name == args[0] {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if !found {
|
||||
if _, ok := proxy.Conf().Servers[args[0]]; !ok {
|
||||
return "Server does not exist."
|
||||
}
|
||||
|
||||
|
|
2
go.mod
2
go.mod
|
@ -2,7 +2,7 @@ module github.com/HimbeerserverDE/mt-multiserver-chatcommands
|
|||
|
||||
go 1.18
|
||||
|
||||
require github.com/HimbeerserverDE/mt-multiserver-proxy v0.0.0-20220502200452-df1eecbee54d
|
||||
require github.com/HimbeerserverDE/mt-multiserver-proxy v0.0.0-20220503054919-fd2bfca06f09
|
||||
|
||||
require (
|
||||
github.com/HimbeerserverDE/srp v0.0.0 // indirect
|
||||
|
|
4
go.sum
4
go.sum
|
@ -1,5 +1,5 @@
|
|||
github.com/HimbeerserverDE/mt-multiserver-proxy v0.0.0-20220502200452-df1eecbee54d h1:RXNlKchc6ggIiINLaYUg590RGakzFZees9P1gQ2lKqM=
|
||||
github.com/HimbeerserverDE/mt-multiserver-proxy v0.0.0-20220502200452-df1eecbee54d/go.mod h1:QcSbqCHaPTEubrFC8TGFVJm9QIH9W03+jzy/TsUfNfw=
|
||||
github.com/HimbeerserverDE/mt-multiserver-proxy v0.0.0-20220503054919-fd2bfca06f09 h1:l2eoJagmy8pLx+FcxyZfGMRsU1tEXZjX353486mi8f0=
|
||||
github.com/HimbeerserverDE/mt-multiserver-proxy v0.0.0-20220503054919-fd2bfca06f09/go.mod h1:QcSbqCHaPTEubrFC8TGFVJm9QIH9W03+jzy/TsUfNfw=
|
||||
github.com/HimbeerserverDE/srp v0.0.0 h1:Iy2GIF7DJphXXO9NjncLEBO6VsZd8Yhrlxl/qTr09eE=
|
||||
github.com/HimbeerserverDE/srp v0.0.0/go.mod h1:pxNH8S2nh4n2DWE0ToX5GnnDr/uEAuaAhJsCpkDLIWw=
|
||||
github.com/anon55555/mt v0.0.0-20210919124550-bcc58cb3048f h1:tZU8VPYLyRrG3Lj9zBZvTVF5tUGciC/2aUIgTcU4WaM=
|
||||
|
|
Loading…
Reference in New Issue