Merge remote-tracking branch 'origin/1.15' into 1.15

This commit is contained in:
MattBDev 2020-02-27 20:28:01 -05:00
commit 6e7cc2d2bc
2 changed files with 2 additions and 2 deletions

View File

@ -388,7 +388,7 @@ public class Settings extends Config {
" - Downloads can be deleted by the user",
" - Supports clipboard uploads, downloads and saves",
})
public String URL = "https://empcraft.com/fawe/";
public String URL = "https://athion.net/fawe/";
@Comment({
"The web interface for assets",
" - All schematics are organized and public",

View File

@ -36,7 +36,7 @@ public abstract class FaweMaskManager {
return this.key;
}
public abstract FaweMask getMask(final Player player, MaskType type);
public FaweMask getMask(final Player player, MaskType type){ return null; }
public boolean isValid(FaweMask mask) {
return true;