Merge branch 'pterodactyl:develop' into nwy-wings
This commit is contained in:
@@ -37,7 +37,7 @@ func (s *Server) Throttler() *ConsoleThrottle {
|
||||
|
||||
s.throttler = newConsoleThrottle(throttles.Lines, period)
|
||||
s.throttler.strike = func() {
|
||||
s.PublishConsoleOutputFromDaemon(fmt.Sprintf("Server is outputting console data too quickly -- throttling..."))
|
||||
s.PublishConsoleOutputFromDaemon("Server is outputting console data too quickly -- throttling...")
|
||||
}
|
||||
})
|
||||
return s.throttler
|
||||
|
||||
@@ -119,10 +119,8 @@ func getFiles(f iofs.ReadDirFS, name string) ([]string, error) {
|
||||
if files == nil {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
for _, f := range files {
|
||||
v = append(v, f)
|
||||
}
|
||||
|
||||
v = append(v, files...)
|
||||
continue
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user