From 49a0c8f9ac1d2198676727fd88476205ea6f2b4f Mon Sep 17 00:00:00 2001 From: Chromachine Date: Sun, 3 Jun 2018 22:18:12 +0000 Subject: [PATCH] Dynmap change, no OpenInv conf OpenInv config contains player settings Art from the main RP world removed from Dynmap --- Jobs/generalConfig.yml | 2 +- Towny/settings/config.yml | 2 +- dynmap/worlds.txt | 11 ++++++++++- update.sh | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Jobs/generalConfig.yml b/Jobs/generalConfig.yml index 38ac544..973eaec 100644 --- a/Jobs/generalConfig.yml +++ b/Jobs/generalConfig.yml @@ -13,7 +13,7 @@ storage: method: sqlite # Requires Mysql. mysql-username: root -mysql-password: '' +mysql-password: 'NOPE' mysql-hostname: localhost:3306 mysql-database: minecraft mysql-table-prefix: jobs_ diff --git a/Towny/settings/config.yml b/Towny/settings/config.yml index 3fc7933..f6eec89 100755 --- a/Towny/settings/config.yml +++ b/Towny/settings/config.yml @@ -445,7 +445,7 @@ plugin: dbname: towny table_prefix: towny_ username: root - password: 'NOPE' + password: NOPE ssl: 'false' # Flatfile backup settings. diff --git a/dynmap/worlds.txt b/dynmap/worlds.txt index 70c4e16..614341c 100755 --- a/dynmap/worlds.txt +++ b/dynmap/worlds.txt @@ -5,7 +5,7 @@ # Definitions of a world made here will superecede any world definition with the same name in configuration.txt # Deleting this file will result in a fresh copy being produced by dynmap.jar on the next startup. # -worlds: +#worlds: # Worlds can be handled by templates, based on world type # You can override the properties of the template by specifying them in this section # for example 'Title: "My Awesome World"' @@ -129,3 +129,12 @@ worlds: - name: world enabled: true template: normal-vlowres #Disabled by default + + hiddenlimits: + - x0: 430 + z0: 2850 + x1: 600 + z1: 3000 + hidestyle: stone + extrazoomout: 2 + bigworld: true diff --git a/update.sh b/update.sh index 46284e3..a6430e3 100755 --- a/update.sh +++ b/update.sh @@ -4,7 +4,7 @@ git rm --cached -rfq '*/*' # Unstage everything in folders in case a plugin got readarray -t plugins < plugins.txt # -t removes trailing newlines for i in "${plugins[@]}" do - if [ -d $i -a $i != "DiscordPlugin" ]; then + if [ -d $i -a $i != "DiscordPlugin" -a $i != "OpenInv" ]; then find $i -name "config.yml" -exec git add -f '{}' \; # All files are ignored, need to force add fi done