Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
This commit is contained in:
William Blake Galbreath
2020-08-23 20:39:32 -05:00
parent 79b0a9b0e7
commit 6ee7cbceeb
14 changed files with 51 additions and 83 deletions

View File

@@ -92,10 +92,10 @@ index 10735e8bd..7f5095f7e 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 3476e6f5f..c3691ab0c 100644
index 70a65cbbb..87cd7debf 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2128,6 +2128,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2131,6 +2131,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;