Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ec9fa369 1.15.2 - Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-06-23 19:39:53 -05:00
parent 05a85435d2
commit 026f2bcfae
5 changed files with 12 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From f9ab48da215fbf1f9cd45ee9daa0a5860dc2c9a5 Mon Sep 17 00:00:00 2001
From e3b69abad347357a82d5891d9d16bd203d99891f 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
@@ -124,10 +124,10 @@ index 723a9fa1e..f56fd7c01 100644
public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 14dc1318a..bf82399c8 100644
index a3db0e92d..685538793 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2838,8 +2838,9 @@ public abstract class EntityLiving extends Entity {
@@ -2839,8 +2839,9 @@ public abstract class EntityLiving extends Entity {
this.aK = f;
}