Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4e0ed1f8 Backport fix for MC-167561 (Fixes #2886, closes#2960)
9946cef8 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-21 14:15:01 -06:00
parent c5ae95f138
commit a098378494
14 changed files with 66 additions and 57 deletions

View File

@@ -1,4 +1,4 @@
From a97f9ffa6e1d0135339df3b5270bbbe342076373 Mon Sep 17 00:00:00 2001
From b9fa5c0edbd9b5602957f7c8e8b67751ae2bea1f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 3 Oct 2019 18:08:03 -0500
Subject: [PATCH] Allow leashing villagers
@@ -11,10 +11,10 @@ Subject: [PATCH] Allow leashing villagers
4 files changed, 19 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 848f03f4c0..33fcb92e3b 100644
index 66b4831949..bac6cea1ff 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1058,6 +1058,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -1062,6 +1062,7 @@ public abstract class EntityInsentient extends EntityLiving {
if (!this.isAlive()) {
return false;
} else if (this.getLeashHolder() == entityhuman) {