From cf994d7e85daf747d0e0155e64d1116617a6eb14 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 16 Aug 2020 10:28:32 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: a168ecf0f Fix items vanishing through end portal (Resolves #2681) (#2894) 4866cb95c Backport Fix items not falling correctly (Resolves #2835) (#2884) b568f4916 Backport missing portions of SPIGOT-5428 fix to 1.14 2f5414ac3 [CI-SKIP] Update artifact version on README 0a8414c40 Fix dupe with Eigencraft redstone implementation (#2866) 2ecb1c648 Do not let the server load chunks from newer versions 84048a8a3 remove burtned TNT blocks (Fixes #2808) 1c3843626 attempt to allow timings to continue with janky plugin classes --- Paper | 2 +- current-paper | 2 +- patches/server/0010-Integrate-ridables.patch | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Paper b/Paper index 4d2f85630..a168ecf0f 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 4d2f85630a3319e4b147ffbfd7db66e38e25f18d +Subproject commit a168ecf0fdf907fd33f7bb994f843952b62e572e diff --git a/current-paper b/current-paper index 78d807940..cfeefe45c 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.14.4--dfcb7bd3d2115a31b4172f42074f0098a511701e +1.14.4--0a7fb8f1f8ba0faf6267a8b07581ce12136078ac diff --git a/patches/server/0010-Integrate-ridables.patch b/patches/server/0010-Integrate-ridables.patch index e298c9815..d6507851c 100644 --- a/patches/server/0010-Integrate-ridables.patch +++ b/patches/server/0010-Integrate-ridables.patch @@ -1,4 +1,4 @@ -From cd7a9a5456600a746914ef7d5c717fac8a84cfb7 Mon Sep 17 00:00:00 2001 +From e11c57fa0d623dd0ca7591cc21324b241f0a110f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 30 Apr 2019 19:17:21 -0500 Subject: [PATCH] Integrate ridables @@ -113,7 +113,7 @@ index 454627f65e..df3d6cf281 100644 this.d = false; this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index dd787b7b65..27ae097578 100644 +index 461d516f5a..f892014383 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -173,7 +173,7 @@ index dd787b7b65..27ae097578 100644 this.passengers.remove(entity); entity.j = 60; } -@@ -3276,4 +3291,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke +@@ -3281,4 +3296,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke public void setMot(double d0, double d1, double d2) { this.setMot(new Vec3D(d0, d1, d2)); } @@ -3227,5 +3227,5 @@ index 56c233872b..b19970c883 100644 + // Purpur end } -- -2.24.0.rc1 +2.26.2