mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
e4d10a6d67
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
38 lines
1.7 KiB
Diff
38 lines
1.7 KiB
Diff
From 1e58ad0c55592a067a4cad8ceeb6f5564fe5cfc9 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 04430aae52..dd21221534 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -208,4 +208,9 @@ public class PaperWorldConfig {
|
|
private void nonPlayerEntitiesOnScoreboards() {
|
|
nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false);
|
|
}
|
|
+
|
|
+ public boolean allowLeashingUndeadHorse = false;
|
|
+ private void allowLeashingUndeadHorse() {
|
|
+ allowLeashingUndeadHorse = getBoolean("allow-leashing-undead-horse", false);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
|
index b611ade248..c56efe035a 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
|
|
@@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
|
|
|
|
@Override
|
|
public boolean a(EntityHuman entityhuman) {
|
|
- return super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD;
|
|
+ return world.paperConfig.allowLeashingUndeadHorse ? super.a(entityhuman) : super.a(entityhuman) && this.getMonsterType() != EnumMonsterType.UNDEAD; // Paper
|
|
}
|
|
|
|
@Override
|
|
--
|
|
2.25.1
|
|
|