Citizens shops are enabled by default now.

Also:
* SKCitizensShopObjectType#isEnabled redundantly checked the config setting.
* The warning which would get printed if citizen shops are enabled but the Citizens plugin is not found has been turned into a debug message.
master
blablubbabc 2020-07-22 01:38:22 +02:00
parent ab7f0f7952
commit c046ebf66c
5 changed files with 5 additions and 4 deletions

View File

@ -37,6 +37,7 @@ Config changes:
* The default value of the `prevent-shop-creation-item-regular-usage` setting was changed to `true`.
* The default value of the `shop-creation-item` setting was changed to a villager spawn egg with display name `&aShopkeeper`. You can give yourself this item in game via the `/shopkeeper give` command.
* The `use-legacy-mob-behavior` setting was broken since MC 1.14 and has been removed now. All shopkeeper entities always use the NoAI flag now.
* The default value of the `enable-citizen-shops` setting was changed to `true`.
Added messages:
* msg-currency-items-given

View File

@ -222,7 +222,7 @@ public class Settings {
public static boolean alwaysShowNameplates = false;
public static String nameplatePrefix = "&a";
public static boolean enableCitizenShops = false;
public static boolean enableCitizenShops = true;
public static boolean enableSignShops = true;
public static boolean enableSignPostShops = true;

View File

@ -100,7 +100,7 @@ public class CitizensShops {
if (!Settings.enableCitizenShops) return; // feature disabled
if (!CitizensHandler.isPluginEnabled()) {
Log.warning("Citizens Shops enabled, but Citizens plugin not found or disabled.");
Log.debug("Citizen shops enabled, but Citizens plugin not found or disabled.");
return;
}
Log.info("Citizens found, enabling NPC shopkeepers.");

View File

@ -49,6 +49,6 @@ public class SKCitizensShopObjectType extends AbstractEntityShopObjectType<SKCit
@Override
public boolean isEnabled() {
return Settings.enableCitizenShops && citizensShops.isEnabled();
return citizensShops.isEnabled();
}
}

View File

@ -254,7 +254,7 @@ always-show-nameplates: false
nameplate-prefix: "&a"
# Whether to allow citizen (npc) shops. Requires the plugin Citizens.
enable-citizen-shops: false
enable-citizen-shops: true
# Whether to allow sign shops.
enable-sign-shops: true