Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
2f0e0a6d Backport feature search improvement from 1.17 (Fixes #2312) (#4771)
b6d9d634 Add API for quit reason
This commit is contained in:
BillyGalbreath
2020-11-14 19:06:39 -06:00
parent be5fcdd8d7
commit 519ac08d10
17 changed files with 69 additions and 69 deletions

View File

@@ -92,10 +92,10 @@ index 202ccf2a7..2fcd7f461 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b1b04ce85..9110a57cc 100644
index 91941763d..2c526846d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2215,6 +2215,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2216,6 +2216,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
PlayerInteractEntityEvent event;