Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
4ed5ab7c Update upstream CB/S
This commit is contained in:
William Blake Galbreath
2019-12-26 21:22:54 -06:00
parent acfe38067b
commit 3da51c1cfa
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0020-Allow-color-codes-on-signs.patch
View File

@@ -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 <blake.galbreath@gmail.com>
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);

6
patches/server/0039-Players-should-not-cram-to-death.patch
View File

@@ -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 <blake.galbreath@gmail.com>
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) {

8
patches/server/0050-Implement-AFK-API.patch
View File

@@ -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 <blake.galbreath@gmail.com>
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();