2019-06-26 03:18:50 +08:00
|
|
|
From 1124538dbf20a006fbefe28d8b32c01c922f1f0c Mon Sep 17 00:00:00 2001
|
2016-03-19 02:20:11 +08:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Fri, 18 Mar 2016 14:19:19 -0400
|
|
|
|
Subject: [PATCH] Undead horse leashing
|
|
|
|
|
|
|
|
default false to match vanilla, but option to allow undead horse types to be leashed.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-06-06 23:36:57 +08:00
|
|
|
index 30f0dcfd51..89556dc94a 100644
|
2016-03-19 02:20:11 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-04-26 09:24:00 +08:00
|
|
|
@@ -201,4 +201,9 @@ public class PaperWorldConfig {
|
2016-07-17 09:10:43 +08:00
|
|
|
private void nonPlayerEntitiesOnScoreboards() {
|
|
|
|
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
2016-03-19 02:20:11 +08:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean allowLeashingUndeadHorse = false;
|
|
|
|
+ private void allowLeashingUndeadHorse() {
|
|
|
|
+ allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
|
|
|
+ }
|
|
|
|
}
|
2016-11-17 10:23:38 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
2019-06-26 03:18:50 +08:00
|
|
|
index cb77d6bd21..b06bbc45cf 100644
|
2016-11-17 10:23:38 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
2019-04-26 09:24:00 +08:00
|
|
|
@@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
|
2016-03-19 02:20:11 +08:00
|
|
|
|
2019-04-26 09:24:00 +08:00
|
|
|
@Override
|
2016-03-19 02:20:11 +08:00
|
|
|
public boolean a(EntityHuman entityhuman) {
|
2016-11-17 10:23:38 +08:00
|
|
|
- return super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD;
|
|
|
|
+ return world.paperConfig.allowLeashingUndeadHorse ? super.a(entityhuman) : super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD; // Paper
|
2016-03-19 02:20:11 +08:00
|
|
|
}
|
|
|
|
|
2019-04-26 09:24:00 +08:00
|
|
|
@Override
|
2016-03-19 02:20:11 +08:00
|
|
|
--
|
2019-06-26 03:18:50 +08:00
|
|
|
2.22.0
|
2016-03-19 02:20:11 +08:00
|
|
|
|