2019-10-27 00:55:58 +02:00
|
|
|
From 7478cfc72f66b5391dc408b2f71d8c53c5129ccc Mon Sep 17 00:00:00 2001
|
2016-03-18 19:20:11 +01: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-10-27 00:55:58 +02:00
|
|
|
index 970de3fe8..aaa1b60f9 100644
|
2016-03-18 19:20:11 +01:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-10-27 00:55:58 +02:00
|
|
|
@@ -206,4 +206,9 @@ public class PaperWorldConfig {
|
2016-07-17 03:10:43 +02:00
|
|
|
private void nonPlayerEntitiesOnScoreboards() {
|
|
|
|
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
2016-03-18 19:20:11 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean allowLeashingUndeadHorse = false;
|
|
|
|
+ private void allowLeashingUndeadHorse() {
|
|
|
|
+ allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
|
|
|
+ }
|
|
|
|
}
|
2016-11-17 03:23:38 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
2019-10-27 00:55:58 +02:00
|
|
|
index 9c7e2437f..8aa60e95f 100644
|
2016-11-17 03:23:38 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
2019-04-26 03:24:00 +02:00
|
|
|
@@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
|
2016-03-18 19:20:11 +01:00
|
|
|
|
2019-04-26 03:24:00 +02:00
|
|
|
@Override
|
2016-03-18 19:20:11 +01:00
|
|
|
public boolean a(EntityHuman entityhuman) {
|
2016-11-17 03:23:38 +01: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-18 19:20:11 +01:00
|
|
|
}
|
|
|
|
|
2019-04-26 03:24:00 +02:00
|
|
|
@Override
|
2016-03-18 19:20:11 +01:00
|
|
|
--
|
2019-10-27 00:55:58 +02:00
|
|
|
2.23.0
|
2016-03-18 19:20:11 +01:00
|
|
|
|