2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-09-25 01:16:16 +02:00
|
|
|
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
|
2020-05-06 11:48:49 +02:00
|
|
|
index c95ce0124d948626732e796c386b7544e34b36c4..18e1ae7f0a4b06ec7d7400e791ac79e5192eb8d8 100644
|
2019-09-25 01:16:16 +02:00
|
|
|
--- 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
|
