2016-07-17 01:10:43 +00:00
|
|
|
From 2d2f5317a0195e8eba7635ce037baf05c6e14f6d Mon Sep 17 00:00:00 2001
|
2016-03-18 18:20:11 +00: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
|
2016-07-17 01:10:43 +00:00
|
|
|
index 308dfdd..55253d6 100644
|
2016-03-18 18:20:11 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2016-07-17 01:10:43 +00:00
|
|
|
@@ -269,4 +269,9 @@ public class PaperWorldConfig {
|
|
|
|
private void nonPlayerEntitiesOnScoreboards() {
|
|
|
|
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
2016-03-18 18:20:11 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean allowLeashingUndeadHorse = false;
|
|
|
|
+ private void allowLeashingUndeadHorse() {
|
|
|
|
+ allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
|
2016-06-09 03:57:14 +00:00
|
|
|
index ef429c1..38c4f61 100644
|
2016-03-18 18:20:11 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHorse.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
|
2016-06-09 03:57:14 +00:00
|
|
|
@@ -169,6 +169,7 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener, IJu
|
2016-03-18 18:20:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public boolean a(EntityHuman entityhuman) {
|
|
|
|
+ if (world.paperConfig.allowLeashingUndeadHorse) { return super.a(entityhuman); } // Paper
|
|
|
|
return !this.getType().h() && super.a(entityhuman);
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2016-06-23 02:18:41 +00:00
|
|
|
2.9.0
|
2016-03-18 18:20:11 +00:00
|
|
|
|