From 2a15b83486a4163706a451e31f09265ac12d8b35 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:39:13 -0500 Subject: [PATCH] Fix leashing villagers config --- docs/source/configuration.rst | 8 +++----- patches/server/0064-Allow-leashing-villagers.patch | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 823306289..959b502fc 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -212,6 +212,9 @@ mobs * brain-ticks - **default**: 2 - **description**: How often (in ticks) should villager's tick their brain logic. Vanilla value is to tick every tick (1). Higher amounts makes them tick less often to reduce lag, but setting it too high could result is unresponsive villagers. + * allow-leashing + - **default**: false + - **description**: Allow players to use leads on villagers (trader not included) * zombie * target-turtle-eggs @@ -337,11 +340,6 @@ allow-sign-colors * **default**: true * **description**: Allow players to use color codes on signs -allow-leashing-villagers -~~~~~~~~~~~~~~~~~~~~~~~~ -* **default**: true -* **description**: Allow players to use leads on villagers (trader not included) - items-can-break-turtle-eggs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ * **default**: false diff --git a/patches/server/0064-Allow-leashing-villagers.patch b/patches/server/0064-Allow-leashing-villagers.patch index 2ed4fcd07..872f4916a 100644 --- a/patches/server/0064-Allow-leashing-villagers.patch +++ b/patches/server/0064-Allow-leashing-villagers.patch @@ -1,4 +1,4 @@ -From b79259289d6aa07a6f9999672fb1633a8c7e9309 Mon Sep 17 00:00:00 2001 +From 69ada1740794b540e8bfa8291af911927d83e298 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers @@ -38,7 +38,7 @@ index d1d62a900..2a848304d 100644 + // Purpur - end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index e08f307c7..0ed0dc8ed 100644 +index e08f307c7..c31d8d23a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -263,9 +263,11 @@ public class PurpurConfig { @@ -49,7 +49,7 @@ index e08f307c7..0ed0dc8ed 100644 private static void villagerSettings() { useVillagerBrainTicksOnlyWhenLagging = getBoolean("settings.mobs.villager.use-brain-ticks-only-when-lagging", useVillagerBrainTicksOnlyWhenLagging); villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks); -+ allowLeashingVillagers = getBoolean("allow-leashing-villagers", allowLeashingVillagers); ++ allowLeashingVillagers = getBoolean("settings.mobs.villager.allow-leashing", allowLeashingVillagers); } public static boolean zombieTargetsTurtleEggs = true;