From 3da51c1cfae7cedb962c1c730c3d23c94f0f1fee Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 21:22:54 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 4ed5ab7c Update upstream CB/S --- Paper | 2 +- current-paper | 2 +- patches/server/0020-Allow-color-codes-on-signs.patch | 6 +++--- .../server/0039-Players-should-not-cram-to-death.patch | 6 +++--- patches/server/0050-Implement-AFK-API.patch | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Paper b/Paper index 9205b75c8..4ed5ab7c7 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 9205b75c86c5bd52af5ac642de1326c8572909a6 +Subproject commit 4ed5ab7c792586ef022528322f09967d734f60a3 diff --git a/current-paper b/current-paper index ee5922227..0ea867866 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.1--2af1239f36ca98bae87f65d3acea99e99b4351a5 +1.15.1--9510ce02cd7105842c05a8dbe5271cf900770cc5 diff --git a/patches/server/0020-Allow-color-codes-on-signs.patch b/patches/server/0020-Allow-color-codes-on-signs.patch index dc7309878..eff478625 100644 --- a/patches/server/0020-Allow-color-codes-on-signs.patch +++ b/patches/server/0020-Allow-color-codes-on-signs.patch @@ -1,4 +1,4 @@ -From 40062ba2309e8947ee3217bd3257bdf3cd1e24cc Mon Sep 17 00:00:00 2001 +From 0a2af1d4016d00efd921c419bf60fa80a5797c5d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Allow color codes on signs @@ -11,10 +11,10 @@ Subject: [PATCH] Allow color codes on signs 4 files changed, 28 insertions(+) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5cd709991..32ad1543b 100644 +index 0888f268f..88b3d295b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1091,6 +1091,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1093,6 +1093,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void openSign(TileEntitySign tileentitysign) { tileentitysign.a((EntityHuman) this); diff --git a/patches/server/0039-Players-should-not-cram-to-death.patch b/patches/server/0039-Players-should-not-cram-to-death.patch index 9d4177e1a..50e4fc102 100644 --- a/patches/server/0039-Players-should-not-cram-to-death.patch +++ b/patches/server/0039-Players-should-not-cram-to-death.patch @@ -1,4 +1,4 @@ -From 0835235b0f6fa6d2b7ac2b602477a93fbeeea26c Mon Sep 17 00:00:00 2001 +From 11e0c0ebeca0da8201ebbe185cf78192fa2993b3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:01:46 -0500 Subject: [PATCH] Players should not cram to death @@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 32ad1543b..4cb276eef 100644 +index 88b3d295b..65b1f657f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1065,7 +1065,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1067,7 +1067,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public boolean isInvulnerable(DamageSource damagesource) { diff --git a/patches/server/0050-Implement-AFK-API.patch b/patches/server/0050-Implement-AFK-API.patch index 036e7cc20..fa39a7781 100644 --- a/patches/server/0050-Implement-AFK-API.patch +++ b/patches/server/0050-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From a063e7d8e839dc8b34deaf97db791706528b6010 Mon Sep 17 00:00:00 2001 +From 56103c262c6b6c8963476f9c2b4feb4850ff7250 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] Implement AFK API @@ -29,7 +29,7 @@ index dee92e5a7..5e99ad814 100644 double d3 = this.locX() - d0; double d4 = this.locY() - d1; diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index e9d1c01ed..f405f0169 100644 +index 57c528d53..3c9f18096 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -49,10 +49,10 @@ index e9d1c01ed..f405f0169 100644 super(EntityTypes.PLAYER, world); this.bV = ItemStack.a; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4cb276eef..e1ed67f41 100644 +index 65b1f657f..6ce35b48a 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1582,8 +1582,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1584,8 +1584,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void resetIdleTimer() { this.cj = SystemUtils.getMonotonicMillis();