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 4911ba74585eb8bca5bb424f9ac530c7f4781587 Mon Sep 17 00:00:00 2001
From f75496fc308131a383f257d95037ee10576c6834 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
4 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c60d13b89d..21b2ff8f8f 100644
index 6acc65abfa..1d96f0242a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1039,6 +1039,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1037,6 +1037,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -22,7 +22,7 @@ index c60d13b89d..21b2ff8f8f 100644
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
@@ -2575,6 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2572,6 +2573,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}