Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c9fd7458 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-08-31 17:36:38 -05:00
parent 2ba5de2b60
commit 318bc72a17
3 changed files with 6 additions and 6 deletions

2
Paper

Submodule Paper updated: aba4969668...c9fd745840

View File

@@ -1 +1 @@
1.14.4--a777f98965354fe01257e0e3ad9859062cb7a4bd
1.14.4--8194b5db72c12403becc68ac5eacf6a8cd9e91f7

View File

@@ -1,4 +1,4 @@
From ce582c4dd08f5a14735aece2c8fc6ee6baa194ec Mon Sep 17 00:00:00 2001
From eb60a54d282def5c1f1dc58fc32cd43c0441aee0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Wed, 29 May 2019 23:39:04 -0500
Subject: [PATCH] Add village raid spawn reason
@@ -8,10 +8,10 @@ Subject: [PATCH] Add village raid spawn reason
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Raid.java b/src/main/java/net/minecraft/server/Raid.java
index f7c10f0ac1..03be050640 100644
index bdcacc141..723bb35ce 100644
--- a/src/main/java/net/minecraft/server/Raid.java
+++ b/src/main/java/net/minecraft/server/Raid.java
@@ -513,7 +513,7 @@ public class Raid {
@@ -536,7 +536,7 @@ public class Raid {
entityraider.prepare(this.k, this.k.getDamageScaler(blockposition), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
entityraider.a(i, false);
entityraider.onGround = true;
@@ -21,5 +21,5 @@ index f7c10f0ac1..03be050640 100644
}
--
2.20.1
2.23.0.rc1