Skip to content

Commit

Permalink
Merge pull request #1 from LoboMetalurgico/master
Browse files Browse the repository at this point in the history
First Merge
  • Loading branch information
LoboMetalurgico authored Feb 11, 2022
2 parents 1d6965c + 0c2841c commit b522dab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;

@SuppressWarnings("CharsetObjectCanBeUsed")
public class MineCityPlugin extends JavaPlugin
{
private MineCityBukkit instance;
Expand Down Expand Up @@ -131,7 +132,6 @@ public void onEnable()
saveDefaultConfig();
reloadConfig();

@SuppressWarnings("SpellCheckingInspection")
FileConfiguration yaml = getConfig();
MineCityConfig config = new MineCityConfig();
config.dbUrl = yaml.getString("database.url", config.dbUrl);
Expand All @@ -141,7 +141,7 @@ public void onEnable()
config.useTitle = yaml.getBoolean("use-titles", true);
config.defaultNatureDisableCities = !yaml.getBoolean("permissions.default.nature.enable-city-creation", true);
config.economy = yaml.getString("economy", "none");
config.permission = yaml.getString("permissions", "bukkit");
config.permission = yaml.getString("permission", "bukkit");

for(PermissionFlag flag: PermissionFlag.values())
{
Expand Down
2 changes: 1 addition & 1 deletion Bukkit/src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ database:
economy: vault

# Possible values: Bukkit, Vault, Sponge, None
permissions: vault
permission: vault

costs:
city:
Expand Down
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ allprojects {
subprojects {
repositories {
mavenCentral()
maven {
name = 'gamemods-nexus'
url = 'http://nexus.gamemods.com.br/content/groups/public/'
}
maven {
name = "spigot-nexus"
url = "https://hub.spigotmc.org/nexus/content/groups/public/"
Expand All @@ -39,7 +35,7 @@ subprojects {
}
maven {
name = 'sponge'
url = 'http://repo.spongepowered.org/maven'
url = 'https://repo.spongepowered.org/maven'
}
maven {
name = 'vault-repo'
Expand Down

0 comments on commit b522dab

Please sign in to comment.