Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +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:
4df3dad8 Reduce PlayerNaturallySpawnCreaturesEvent calls
This commit is contained in:
William Blake Galbreath
2020-03-01 19:55:49 -06:00
parent 6f0bd3a6cf
commit 024dc406b8
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: c0f4b24e3a...4df3dad85d

2
current-paper
View File

@@ -1 +1 @@
1.15.2--6ef465737775c0e6caf3bc4c14d8f397851e5c15 1.15.2--0f0446d7fa69d9a7b7a7bcd0903c386249009e6e

8
patches/server/0032-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From 3a5eaa8f5cd657c550407ef4f0291b61bfa1bede Mon Sep 17 00:00:00 2001 From 6d602cf3031c13a71f4f25da90dbc35deb091784 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500 Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes Subject: [PATCH] Signs allow color codes
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
4 files changed, 25 insertions(+) 4 files changed, 25 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 15230a834c..415cdb1c30 100644 index e7bfbc3307..a2f239b49e 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1124,6 +1124,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1126,6 +1126,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override @Override
public void openSign(TileEntitySign tileentitysign) { public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this); tileentitysign.a((EntityHuman) this);
@@ -67,7 +67,7 @@ index 099d98e04c..19d76c8cce 100644
@Override @Override
public PacketPlayOutTileEntityData getUpdatePacket() { public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 63afc5d98e..7891812a87 100644 index dfa6318039..7395abfb6f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -76,8 +76,10 @@ public class PurpurWorldConfig { @@ -76,8 +76,10 @@ public class PurpurWorldConfig {

6
patches/server/0041-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From fe7a867041542145cc9fb41d1016040fe8f64800 Mon Sep 17 00:00:00 2001 From 08797ff8d48c0268a102240df3ca28ca6a631741 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 8 Aug 2019 15:29:15 -0500 Date: Thu, 8 Aug 2019 15:29:15 -0500
Subject: [PATCH] Implement AFK API Subject: [PATCH] Implement AFK API
@@ -49,10 +49,10 @@ index de22cad764..9d26bd1e4c 100644
super(EntityTypes.PLAYER, world); super(EntityTypes.PLAYER, world);
this.bV = ItemStack.a; this.bV = ItemStack.a;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 415cdb1c30..670dcf2829 100644 index a2f239b49e..1b5140a357 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1615,8 +1615,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1617,8 +1617,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() { public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis(); this.cj = SystemUtils.getMonotonicMillis();

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

@@ -1,4 +1,4 @@
From c2e70240753bdc84eb8b3467657b8760ffa01193 Mon Sep 17 00:00:00 2001 From 89ad75d591ff610897e8473cb51db36c1dd793a5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500 Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death 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(-) 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 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 670dcf2829..b2dbeb0b0a 100644 index 1b5140a357..66ac64d1fc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1098,7 +1098,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1100,7 +1100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override @Override
public boolean isInvulnerable(DamageSource damagesource) { public boolean isInvulnerable(DamageSource damagesource) {