mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
8ad9357437
Upstream has released updates that appears to apply and compile correctly Paper Changes: 19ff55ef Update upstream B/CB 79710332 Update upstream CB 19de9af6 1.15.2 update (#2887) d4ae43fc Updated Upstream (Bukkit/CraftBukkit) 9c2d9a5f [CI-SKIP] Rebuild patches 86a4b752 Fix items not falling correctly (Resolves #2835) (#2872) 35472de2 Port activation range improvement patch (#2763) 617f6033 Add effect to block break naturally (#2819) f63cfe00 Updated Upstream (Bukkit/CraftBukkit) 00860e4e [CI-SKIP] rebuild patches 3d519668 Prevent sync chunk loads when villagers try to find beds (#2855)
59 lines
3.1 KiB
Diff
59 lines
3.1 KiB
Diff
From 5951f8637bdb457ae59201563ce04832cb1595ae Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Thu, 3 Oct 2019 18:08:03 -0500
|
|
Subject: [PATCH] Allow leashing villagers
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityInsentient.java | 1 +
|
|
src/main/java/net/minecraft/server/EntityVillager.java | 7 +++++++
|
|
src/main/java/net/pl3x/purpur/PurpurConfig.java | 2 ++
|
|
3 files changed, 10 insertions(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
index 97081f6a4..491db81ba 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
@@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
|
if (!this.isAlive()) {
|
|
return false;
|
|
} else if (this.getLeashHolder() == entityhuman) {
|
|
+ if (net.pl3x.purpur.PurpurConfig.allowLeashingVillagers && enumhand == EnumHand.OFF_HAND && this instanceof EntityVillager) return true; // Purpur
|
|
// CraftBukkit start - fire PlayerUnleashEntityEvent
|
|
if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
|
|
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
|
|
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
|
|
index 10625b3ab..cd8da30a1 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityVillager.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
|
|
@@ -980,4 +980,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 net.pl3x.purpur.PurpurConfig.allowLeashingVillagers && !this.isLeashed();
|
|
+ }
|
|
+ // Purpur - end
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index 0537d0681..8298a1276 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -235,9 +235,11 @@ public class PurpurConfig {
|
|
|
|
public static boolean useVillagerBrainTicksOnlyWhenLagging = true;
|
|
public static int villagerBrainTicks = 20;
|
|
+ public static boolean allowLeashingVillagers = false;
|
|
private static void villagerSettings() {
|
|
useVillagerBrainTicksOnlyWhenLagging = getBoolean("settings.mobs.villager.use-brain-ticks-only-when-lagging", useVillagerBrainTicksOnlyWhenLagging);
|
|
villagerBrainTicks = getInt("settings.mobs.villager.brain-ticks", villagerBrainTicks);
|
|
+ allowLeashingVillagers = getBoolean("settings.mobs.villager.allow-leashing", allowLeashingVillagers);
|
|
}
|
|
|
|
public static boolean largeEnderChests = true;
|
|
--
|
|
2.24.0
|
|
|