Merge master into '450-new-settings-rewrite'
Conflicts: - PerformBackup.java - Settings.java
This commit is contained in:
@@ -186,7 +186,6 @@ public class UtilsTest {
|
||||
}
|
||||
|
||||
// Note: This method is used through reflections
|
||||
@SuppressWarnings("unused")
|
||||
public static Player[] onlinePlayersImpl() {
|
||||
return new Player[]{
|
||||
mock(Player.class), mock(Player.class)
|
||||
|
||||
Reference in New Issue
Block a user