Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix entities targetting while being ridden

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-02 01:01:03 -06:00
parent 034b14495c
commit 7839152785
15 changed files with 583 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0060-Allow-leashing-villagers.patch
View File

@@ -1,4 +1,4 @@
From 5951f8637bdb457ae59201563ce04832cb1595ae Mon Sep 17 00:00:00 2001
From 35e3756e3ce2321954c38217ec665122095ce4cf 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
@@ -22,10 +22,10 @@ index 97081f6a4..491db81ba 100644
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
index a0137c7af..a53decb2c 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
@@ -987,4 +987,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;
}