Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move using_economy to the eco section of the config #7265

Merged
merged 1 commit into from
Feb 19, 2024
Merged

Move using_economy to the eco section of the config #7265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Towny/src/main/java/com/palmergames/bukkit/config/ConfigNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,14 +1471,6 @@ public enum ConfigNodes {
"plugin.interfacing.tekkit.fake_residents",
"[IndustrialCraft],[BuildCraft],[Redpower],[Forestry],[Turtle]",
"# Add any fake players for client/server mods (aka Tekkit) here"),
PLUGIN_USING_ECONOMY(
"plugin.interfacing.using_economy",
"true",
"",
"# This enables/disables all the economy functions of Towny.",
"# This will first attempt to use Vault or Reserve to bridge your economy plugin with Towny.",
"# If Reserve/Vault is not present it will attempt to find a supported economy plugin.",
"# If neither Vault/Reserve or supported economy are present it will not be possible to create towns or do any operations that require money."),

PLUGIN_LUCKPERMS_ROOT("plugin.interfacing.luckperms","",""),
PLUGIN_LUCKPERMS_CONTEXTS(
Expand Down Expand Up @@ -2328,6 +2320,14 @@ public enum ConfigNodes {
"# +------------------------------------------------------+ #",
"############################################################",
""),
ECO_USING_ECONOMY(
"economy.using_economy",
"true",
"",
"# This enables/disables all the economy functions of Towny.",
"# This will first attempt to use Vault or Reserve to bridge your economy plugin with Towny.",
"# If Reserve/Vault is not present it will attempt to find a supported economy plugin.",
"# If neither Vault/Reserve or supported economy are present it will not be possible to create towns or do any operations that require money."),
ECO_USE_ASYNC(
"economy.use_async",
"true",
Expand Down
2 changes: 1 addition & 1 deletion Towny/src/main/java/com/palmergames/bukkit/towny/TownySettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@ public static boolean isFriendlyFireEnabled() {

public static boolean isUsingEconomy() {

return getBoolean(ConfigNodes.PLUGIN_USING_ECONOMY);
return getBoolean(ConfigNodes.ECO_USING_ECONOMY);
}

public static boolean isFakeResident(String name) {
Expand Down
10 changes: 10 additions & 0 deletions Towny/src/main/resources/config-migration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,5 +836,15 @@
"value": "spawning.nation_spawn.spawning_cooldowns.unaffiliated_nation_spawn_cooldown_time"
}
]
},
{
"version": "0.100.1.15",
"changes": [
{
"type": "MOVE",
"path": "plugin.interfacing.using_economy",
"value": "economy.using_economy"
}
]
}
]
Loading