-
-
Notifications
You must be signed in to change notification settings - Fork 360
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
03be5e1
commit bd3407f
Showing
2 changed files
with
50 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
From 410c0124e6648f16ab4dcd569b1a2df1a22f3343 Mon Sep 17 00:00:00 2001 | ||
From: William Blake Galbreath <blake.galbreath@gmail.com> | ||
Date: Wed, 10 Jul 2019 20:14:07 -0500 | ||
Subject: [PATCH] Allow leashing villagers | ||
|
||
--- | ||
src/main/java/net/minecraft/server/EntityVillager.java | 7 +++++++ | ||
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++ | ||
2 files changed, 12 insertions(+) | ||
|
||
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java | ||
index 07f7b90f5..d06889844 100644 | ||
--- a/src/main/java/net/minecraft/server/EntityVillager.java | ||
+++ b/src/main/java/net/minecraft/server/EntityVillager.java | ||
@@ -879,4 +879,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation | ||
|
||
return optional.isPresent() && optional1.isPresent() ? i - ((MinecraftSerializableLong) optional.get()).a() < 24000L && i - ((MinecraftSerializableLong) optional1.get()).a() < 36000L : false; | ||
} | ||
+ | ||
+ // Purpur - start | ||
+ @Override | ||
+ public boolean a(EntityHuman entityhuman) { | ||
+ return world.purpurConfig.allowLeashingVillagers && !this.isLeashed(); | ||
+ } | ||
+ // Purpur - end | ||
} | ||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | ||
index a33eb6773..542e1b329 100644 | ||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | ||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | ||
@@ -107,6 +107,11 @@ public class PurpurWorldConfig { | ||
allowSignColors = getBoolean("allow-sign-colors", allowSignColors); | ||
} | ||
|
||
+ public boolean allowLeashingVillagers = true; | ||
+ private void allowLeashingVillagers() { | ||
+ allowLeashingVillagers = getBoolean("allow-leashing-villagers", allowLeashingVillagers); | ||
+ } | ||
+ | ||
public boolean itemsCanBreakTurtleEggs = false; | ||
private void itemsCanBreakTurtleEggs() { | ||
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs); | ||
-- | ||
2.20.1 | ||
|