Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
3398704d Name the specific plugin generator class that isn't updated
aa776c1b Don't save canTick of armor stands if it has not been set by API (#2608)
This commit is contained in:
William Blake Galbreath
2019-10-03 18:45:13 -05:00
parent 2a15b83486
commit bd4f9486b5
3 changed files with 5 additions and 5 deletions

2
Paper

Submodule Paper updated: bfc807c27a...3398704d7f

View File

@@ -1 +1 @@
1.14.4--43a8d3202192eb81cb77a730c55a7dd7d8dbdda8
1.14.4--ca767ef7710ba4ca98119029479ba4e80a3c521f

View File

@@ -1,4 +1,4 @@
From 2a3b0f606831fe8bbacd2f7f1a8d4da080ac481f Mon Sep 17 00:00:00 2001
From 48791694b27ee61585777c5ea1ca56edf1a0d01e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:06:20 -0500
Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -32,10 +32,10 @@ index 457d973af..468d6cc3e 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 75ac07537..3cf0fdf56 100644
index 3b30e75e3..f7b9c1aa5 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -316,7 +316,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
}
@Override