Merge branch 'pterodactyl:develop' into nwy-wings

This commit is contained in:
Ethan Alicea
2023-10-15 15:05:47 -04:00
committed by GitHub
10 changed files with 108 additions and 51 deletions

View File

@@ -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

View File

@@ -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
}