mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@55475f0 [ci skip] Fix typos PaperMC/Paper@f8e2a67 Check for AbstractBoat instead of Boat in EAR ignore list PaperMC/Paper@8dc42fa Add API to check if the server is sleeping (#11605) PaperMC/Paper@817550c Add API to allow/disallow tick sleeping (#11611) PaperMC/Paper@915637d Run 'freeze' listeners before tag events (#11606) PaperMC/Paper@751e9bd Fix jukebox component (#11642) PaperMC/Paper@f241260 Make TypedKey an actual Key (#11641) PaperMC/Paper@860d948 Support tags for more SimpleRegistry (#11607) PaperMC/Paper@aee6f7a Correctly mirror vanilla non-exact ingredients (#11651) PaperMC/Paper@eef40b7 Configurable Entity Despawn Time (#11454) PaperMC/Paper@edabff8 Correctly damage tick wolf after armor block (#11653) PaperMC/Paper@6051dac Painting variant registry modification API (#11648) PaperMC/Paper@bb32b05 Call ProjectileHitEvent for entity hits (#11652)
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow leashing villagers
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 2750f1f0d572f7c4f8b855c32bd1946c2de1bc00..45e53779e30763077b5374680a63cc277715500c 100644
|
||||
index 1e639ab3e48d884ee6e2c33be85dde51e24183b6..75b0a66be9f94c82a02f714860ae8bee323db2a3 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -3126,6 +3126,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
@@ -3134,6 +3134,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
if (this.isAlive() && this instanceof Leashable leashable) {
|
||||
if (leashable.getLeashHolder() == player) {
|
||||
if (!this.level().isClientSide()) {
|
||||
|
||||
Reference in New Issue
Block a user