mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 04:56:50 +01:00
36f34f01c0
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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Tue, 24 Sep 2019 16:03:00 -0700
|
|
Subject: [PATCH] Fix MC-161754
|
|
|
|
Fixes https://github.com/PaperMC/Paper/issues/2580
|
|
|
|
We can use an entity valid check since this method is invoked for
|
|
each inventory iteraction (thanks to CB) and on player tick (vanilla).
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java
|
|
index c95ce0124d948626732e796c386b7544e34b36c4..18e1ae7f0a4b06ec7d7400e791ac79e5192eb8d8 100644
|
|
--- a/src/main/java/net/minecraft/server/ContainerHorse.java
|
|
+++ b/src/main/java/net/minecraft/server/ContainerHorse.java
|
|
@@ -76,7 +76,7 @@ public class ContainerHorse extends Container {
|
|
|
|
@Override
|
|
public boolean canUse(EntityHuman entityhuman) {
|
|
- return this.c.a(entityhuman) && this.d.isAlive() && this.d.g((Entity) entityhuman) < 8.0F;
|
|
+ return this.c.a(entityhuman) && (this.d.isAlive() && this.d.valid) && this.d.g((Entity) entityhuman) < 8.0F; // Paper - Fix MC-161754
|
|
}
|
|
|
|
@Override
|