From 71f6c663a04adfca7f8114ee87987f68489fa506 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 8 Nov 2019 02:31:44 +0100 Subject: [PATCH] Update Towny to 0.95.0.0 --- Towny/settings/config.yml | 42 ++++++++++++++++++++++++++--------- Towny/settings/townyperms.yml | 4 ++++ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml index 4eb15c1..c4f1a35 100644 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -1,8 +1,8 @@ version: # This is the current version of Towny. Please do not edit. - version: 0.94.0.12 + version: 0.95.0.0 # This is for showing the changelog on updates. Please do not edit. - last_run_version: 0.94.0.12 + last_run_version: 0.95.0.0 # The language file you wish to use language: english.yml @@ -291,13 +291,13 @@ new_world_settings: block_delete: enabled: 'false' # These items will be deleted upon a plot being unclaimed - unclaim_delete: BED_BLOCK,TORCH,REDSTONE_WIRE,SIGN_POST,WOODEN_DOOR,WALL_SIGN,STONE_PLATE,IRON_DOOR_BLOCK,WOOD_PLATE,REDSTONE_TORCH_OFF,REDSTONE_TORCH_ON,DIODE_BLOCK_OFF,DIODE_BLOCK_ON + unclaim_delete: BED_BLOCK,TORCH,REDSTONE_WIRE,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,WOODEN_DOOR,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,STONE_PLATE,IRON_DOOR_BLOCK,WOOD_PLATE,REDSTONE_TORCH_OFF,REDSTONE_TORCH_ON,DIODE_BLOCK_OFF,DIODE_BLOCK_ON mayor_plotblock_delete: enabled: 'true' # These items will be deleted upon a mayor using /plot clear # To disable deleting replace the current entries with NONE. - mayor_plot_delete: WALL_SIGN,SIGN_POST + mayor_plot_delete: ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN revert_on_unclaim: # *** WARNING*** @@ -315,7 +315,7 @@ new_world_settings: enabled: 'false' speed: 1s # These block types will NOT be regenerated - block_ignore: GOLD_ORE,LAPIS_ORE,LAPIS_BLOCK,GOLD_BLOCK,IRON_BLOCK,MOSSY_COBBLESTONE,TORCH,MOB_SPAWNER,DIAMOND_ORE,DIAMOND_BLOCK,SIGN_POST,WALL_SIGN,GLOWSTONE + block_ignore: GOLD_ORE,LAPIS_ORE,LAPIS_BLOCK,GOLD_BLOCK,IRON_ORE,IRON_BLOCK,MOSSY_COBBLESTONE,TORCH,SPAWNER,DIAMOND_ORE,DIAMOND_BLOCK,ACACIA_SIGN,BIRCH_SIGN,DARK_OAK_SIGN,JUNGLE_SIGN,OAK_SIGN,SPRUCE_SIGN,ACACIA_WALL_SIGN,BIRCH_WALL_SIGN,DARK_OAK_WALL_SIGN,JUNGLE_WALL_SIGN,OAK_WALL_SIGN,SPRUCE_WALL_SIGN,GLOWSTONE,EMERALD_ORE,EMERALD_BLOCK wild_revert_on_mob_explosion: # Enabling this will slowly regenerate holes created in the @@ -505,7 +505,7 @@ plugin: dbname: towny table_prefix: towny_ username: root - password: 'NOPE' + password: '' ssl: 'false' # Flatfile backup settings. @@ -568,7 +568,7 @@ filters_colour_chat: regex: name_filter_regex: '[ /]' name_check_regex: ^[a-zA-Z0-9._\[\]-]*$ - string_check_regex: ^[a-zA-Z0-9\s._\[\]\#\?\!\@\$\%\^\&\*\-\,\*\(\)\{\}]*$ + string_check_regex: ^[a-zA-Z0-9 \s._\[\]\#\?\!\@\$\%\^\&\*\-\,\*\(\)\{\}]*$ name_remove_regex: '[^a-zA-Z0-9._\[\]-]' modify_chat: @@ -576,6 +576,21 @@ filters_colour_chat: max_name_length: '20' # Maximum length of titles and surnames. max_title_length: '10' + # See How Towny Works wikipage for list of PAPI placeholders. + # https://github.com/TownyAdvanced/Towny/wiki/How-Towny-Works + papi_chat_formatting: + # When using PlaceholderAPI, and a tag would show both nation and town, this will determine how they are formatted. + both: '&f[&6%n&f|&b%t&f] ' + # When using PlaceholderAPI, and a tag would showing a town, this will determine how it is formatted. + town: '&f[&b%s&f] ' + # When using PlaceholderAPI, and a tag would show a nation, this will determine how it is formatted. + nation: '&f[&6%s&f] ' + # Colour code applied to player names using the %townyadvanced_towny_colour% placeholder. + ranks: + nomad: '&f' + resident: '&f' + mayor: '&b' + king: '&6' ############################################################ @@ -596,12 +611,12 @@ protection: # 368 - ender pearl # 374 - glass bottle # 385 - fire charge - item_use_ids: BONE_MEAL,FLINT_AND_STEEL,BUCKET,WATER_BUCKET,LAVA_BUCKET,MINECART,STORAGE_MINECART,INK_SACK,SHEARS,ENDER_PEARL,GLASS_BOTTLE,FIREBALL,ARMOR_STAND,SKULL_ITEM,BIRCH_BOAT,ACACIA_BOAT,DARK_OAK_BOAT,JUNGLE_BOAT,OAK_BOAT,SPRUCE_BOAT,END_CRYSTAL,POWERED_MINECART,COMMAND_MINECART,EXPLOSIVE_MINECART,HOPPER_MINECART,CHORUS_FRUIT + item_use_ids: BONE_MEAL,FLINT_AND_STEEL,BUCKET,WATER_BUCKET,LAVA_BUCKET,MINECART,STORAGE_MINECART,INK_SACK,SHEARS,ENDER_PEARL,GLASS_BOTTLE,FIREBALL,ARMOR_STAND,SKULL_ITEM,BIRCH_BOAT,ACACIA_BOAT,DARK_OAK_BOAT,JUNGLE_BOAT,OAK_BOAT,SPRUCE_BOAT,END_CRYSTAL,POWERED_MINECART,COMMAND_MINECART,EXPLOSIVE_MINECART,HOPPER_MINECART,CHORUS_FRUIT,BLACK_DYE,BLUE_DYE,BROWN_DYE,CYAN_DYE,GRAY_DYE,GREEN_DYE,LIGHT_BLUE_DYE,LIGHT_GRAY_DYE,LIME_DYE,MAGENTA_DYE,ORANGE_DYE,PINK_DYE,PURPLE_DYE,RED_DYE,WHITE_DYE,YELLOW_DYE # Items which can be blocked or enabled via town/plot flags # 25 - noteblock # 54 - chest ...etc - switch_ids: JUKEBOX,NOTE_BLOCK,BEACON,CHEST,TRAPPED_CHEST,FURNACE,DISPENSER,HOPPER,DROPPER,LEVER,COMPARATOR,REPEATER,STONE_PRESSURE_PLATE,ACACIA_PRESSURE_PLATE,BIRCH_PRESSURE_PLATE,DARK_OAK_PRESSURE_PLATE,JUNGLE_PRESSURE_PLATE,OAK_PRESSURE_PLATE,SPRUCE_PRESSURE_PLATE,HEAVY_WEIGHTED_PRESSURE_PLATE,LIGHT_WEIGHTED_PRESSURE_PLATE,STONE_BUTTON,ACACIA_BUTTON,BIRCH_BUTTON,DARK_OAK_BUTTON,JUNGLE_BUTTON,OAK_BUTTON,SPRUCE_BUTTON,ACACIA_DOOR,BIRCH_DOOR,DARK_OAK_DOOR,JUNGLE_DOOR,OAK_DOOR,SPRUCE_DOOR,ACACIA_FENCE_GATE,BIRCH_FENCE_GATE,DARK_OAK_FENCE_GATE,OAK_FENCE_GATE,JUNGLE_FENCE_GATE,SPRUCE_FENCE_GATE,ACACIA_TRAPDOOR,BIRCH_TRAPDOOR,DARK_OAK_TRAPDOOR,JUNGLE_TRAPDOOR,OAK_TRAPDOOR,SPRUCE_TRAPDOOR,MINECART,COMMAND_BLOCK_MINECART,CHEST_MINECART,FURNACE_MINECART,HOPPER_MINECART,TNT_MINECART,SHULKER_BOX,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX,CARROT_STICK,DAYLIGHT_DETECTOR,STONECUTTER,SMITHING_TABLE,FLETCHING_TABLE,SMOKER,LOOM,LECTERN,GRINDSTONE,COMPOSTER,CARTOGRAPHY_TABLE,BLAST_FURNACE,BELL,BARREL,DRAGON_EGG,ITEM_FRAME,POTTED_ACACIA_SAPLING,POTTED_ALLIUM,POTTED_AZURE_BLUET,POTTED_BAMBOO,POTTED_BIRCH_SAPLING,POTTED_BLUE_ORCHID,POTTED_BROWN_MUSHROOM,POTTED_CACTUS,POTTED_CORNFLOWER,POTTED_DANDELION,POTTED_DARK_OAK_SAPLING,POTTED_DEAD_BUSH,POTTED_FERN,POTTED_JUNGLE_SAPLING,POTTED_LILY_OF_THE_VALLEY,POTTED_OAK_SAPLING,POTTED_ORANGE_TULIP,POTTED_OXEYE_DAISY,POTTED_PINK_TULIP,POTTED_POPPY,POTTED_RED_MUSHROOM,POTTED_RED_TULIP,POTTED_SPRUCE_SAPLING,POTTED_WHITE_TULIP,POTTED_WITHER_ROSE + switch_ids: JUKEBOX,NOTE_BLOCK,BEACON,CHEST,TRAPPED_CHEST,FURNACE,DISPENSER,HOPPER,DROPPER,LEVER,COMPARATOR,REPEATER,STONE_PRESSURE_PLATE,ACACIA_PRESSURE_PLATE,BIRCH_PRESSURE_PLATE,DARK_OAK_PRESSURE_PLATE,JUNGLE_PRESSURE_PLATE,OAK_PRESSURE_PLATE,SPRUCE_PRESSURE_PLATE,HEAVY_WEIGHTED_PRESSURE_PLATE,LIGHT_WEIGHTED_PRESSURE_PLATE,STONE_BUTTON,ACACIA_BUTTON,BIRCH_BUTTON,DARK_OAK_BUTTON,JUNGLE_BUTTON,OAK_BUTTON,SPRUCE_BUTTON,ACACIA_DOOR,BIRCH_DOOR,DARK_OAK_DOOR,JUNGLE_DOOR,OAK_DOOR,SPRUCE_DOOR,ACACIA_FENCE_GATE,BIRCH_FENCE_GATE,DARK_OAK_FENCE_GATE,OAK_FENCE_GATE,JUNGLE_FENCE_GATE,SPRUCE_FENCE_GATE,ACACIA_TRAPDOOR,BIRCH_TRAPDOOR,DARK_OAK_TRAPDOOR,JUNGLE_TRAPDOOR,OAK_TRAPDOOR,SPRUCE_TRAPDOOR,MINECART,COMMAND_BLOCK_MINECART,CHEST_MINECART,FURNACE_MINECART,HOPPER_MINECART,TNT_MINECART,SHULKER_BOX,WHITE_SHULKER_BOX,ORANGE_SHULKER_BOX,MAGENTA_SHULKER_BOX,LIGHT_BLUE_SHULKER_BOX,LIGHT_GRAY_SHULKER_BOX,YELLOW_SHULKER_BOX,LIME_SHULKER_BOX,PINK_SHULKER_BOX,GRAY_SHULKER_BOX,CYAN_SHULKER_BOX,PURPLE_SHULKER_BOX,BLUE_SHULKER_BOX,BROWN_SHULKER_BOX,GREEN_SHULKER_BOX,RED_SHULKER_BOX,BLACK_SHULKER_BOX,CARROT_STICK,DAYLIGHT_DETECTOR,STONECUTTER,SMITHING_TABLE,FLETCHING_TABLE,SMOKER,LOOM,LECTERN,GRINDSTONE,COMPOSTER,CARTOGRAPHY_TABLE,BLAST_FURNACE,BELL,BARREL,DRAGON_EGG,ITEM_FRAME,POTTED_ACACIA_SAPLING,POTTED_ALLIUM,POTTED_AZURE_BLUET,POTTED_BAMBOO,POTTED_BIRCH_SAPLING,POTTED_BLUE_ORCHID,POTTED_BROWN_MUSHROOM,POTTED_CACTUS,POTTED_CORNFLOWER,POTTED_DANDELION,POTTED_DARK_OAK_SAPLING,POTTED_DEAD_BUSH,POTTED_FERN,POTTED_JUNGLE_SAPLING,POTTED_LILY_OF_THE_VALLEY,POTTED_OAK_SAPLING,POTTED_ORANGE_TULIP,POTTED_OXEYE_DAISY,POTTED_PINK_TULIP,POTTED_POPPY,POTTED_RED_MUSHROOM,POTTED_RED_TULIP,POTTED_SPRUCE_SAPLING,POTTED_WHITE_TULIP,POTTED_WITHER_ROSE,BARREL # permitted entities https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/entity/LivingEntity.html # Animals, Chicken, Cow, Creature, Creeper, Flying, Ghast, Giant, Monster, Pig, @@ -625,6 +640,9 @@ protection: # Prevent the spawning of villager babies in the world. world_prevent_villager_breeding: 'false' + # When set to true, mobs who've been named with a nametag will not be removed by the mob removal task. + mob_removal_skips_named_mobs: 'false' + # The maximum amount of time a mob could be inside a town's boundaries before being sent to the void. # Lower values will check all entities more often at the risk of heavier burden and resource use. # NEVER set below 1. @@ -833,12 +851,14 @@ invite_system: resident_settings: # player is flagged as inactive after 1 hour (default) inactive_after_time: 1h - # if enabled old residents will be kicked and deleted from a town + # if enabled old residents will be deleted, losing their town, townblocks, friends # after Two months (default) of not logging in delete_old_residents: enable: 'false' deleted_after_time: 60d delete_economy_account: 'true' + # When true only residents who have no town will be deleted. + delete_only_townless: 'false' # The name of the town a resident will automatically join when he first registers. default_town_name: '' # If true, players can only use beds in plots they personally own. @@ -1002,6 +1022,8 @@ jail: is_allowing_bail: 'false' #Amount that bail costs. bail_amount: '10' + # Commands which a jailed player cannot use. + blacklisted_commands: home,spawn,teleport,tp,tpa,tphere,tpahere,back,dback,ptp,jump,kill,warp,suicide ############################################################ diff --git a/Towny/settings/townyperms.yml b/Towny/settings/townyperms.yml index 424bf5b..9734e13 100644 --- a/Towny/settings/townyperms.yml +++ b/Towny/settings/townyperms.yml @@ -27,6 +27,9 @@ nomad: - towny.town.resident - towny.town.spawn.public - towny.chat.general + - towny.command.nation.townlist + - towny.command.nation.allylist + - towny.command.nation.enemylist # This section of permissions covers players who are members of a town. towns: @@ -55,6 +58,7 @@ towns: - towny.command.nation.new - towny.command.nation.leave - towny.outlaw.jailer + - towny.command.nation.join ranks: # Ranks contain additional permissions residents will be