Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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:
f177f878 Full chunk debug on incremental watchdog (#2868)
c2954557 Fix last firework in stack not having effects when dispensed - #2871 (#2876)
dd8b8df0 Ensure portal search radius is used when teleporting players (#2877)
This commit is contained in:
William Blake Galbreath
2020-01-18 11:55:13 -06:00
parent 04686a66b8
commit ab2c6c147e
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 701114058c...f177f878a8

2
current-paper
View File

@@ -1 +1 @@
1.15.1--6b24d939c7c4f58a9e639a910e50d08dd38c49e3
1.15.1--613341485330744f24c3571d6155c3a22759de90

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

@@ -1,4 +1,4 @@
From f36f4a5ca0b2017ab6da339d7a97d5f25e4ab1ec Mon Sep 17 00:00:00 2001
From 75624e914d39270de5805777883611d434357ae4 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 638d1469bd..bcab00c068 100644
index 9a61dda82..4c1ccdd6f 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1118,6 +1118,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1120,6 +1120,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index 638d1469bd..bcab00c068 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a1ce2d2e07..213f7992dc 100644
index a1ce2d2e0..213f7992d 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2575,6 +2575,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index a1ce2d2e07..213f7992dc 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index 5eb86c4341..8810a1120b 100644
index 5eb86c434..8810a1120 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -119,6 +119,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 5eb86c4341..8810a1120b 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6cb887ca8b..061b02e45a 100644
index 6cb887ca8..061b02e45 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -95,4 +95,9 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From 16066e973580d0b1fc87d9f012fcfde6a914e644 Mon Sep 17 00:00:00 2001
From ffdf3c98b94794ee51cb65db5ac085e7a6271fde 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 bcab00c068..f7df54228d 100644
index 4c1ccdd6f..df20e5706 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1092,7 +1092,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1094,7 +1094,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {

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

@@ -1,4 +1,4 @@
From d06261552766977bb5db6c507bc22df984eceea6 Mon Sep 17 00:00:00 2001
From e1788bab43596625b24bb8d5cc7d9648a457a3e2 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
@@ -17,7 +17,7 @@ Subject: [PATCH] Implement AFK API
10 files changed, 112 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b9f678f26b..b502e589d4 100644
index 1837842c7..cbddb1d6b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1374,6 +1374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -29,7 +29,7 @@ index b9f678f26b..b502e589d4 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 57c528d532..3c9f180960 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 57c528d532..3c9f180960 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 f7df54228d..42bc1515e4 100644
index df20e5706..e91cf84f7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1609,8 +1609,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1611,8 +1611,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();
@@ -105,7 +105,7 @@ index f7df54228d..42bc1515e4 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 818243351e..69f4fedd01 100644
index 818243351..69f4fedd0 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -116,28 +116,18 @@ public interface IEntityAccess {
@@ -150,7 +150,7 @@ index 818243351e..69f4fedd01 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 8d7273a38b..71c61dc45e 100644
index 8d7273a38..71c61dc45 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -170,7 +170,7 @@ index 8d7273a38b..71c61dc45e 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * d3;
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a4af019bc6..2db59c55ca 100644
index a4af019bc..2db59c55c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -277,6 +277,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,7 +205,7 @@ index a4af019bc6..2db59c55ca 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index fbfe37ea0a..4dfcce82de 100644
index fbfe37ea0..4dfcce82d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -376,7 +376,7 @@ public class WorldServer extends World {
@@ -227,7 +227,7 @@ index fbfe37ea0a..4dfcce82de 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 6d875b78b9..7422f361e4 100644
index 6d875b78b..7422f361e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -106,6 +106,21 @@ public class PurpurWorldConfig {
@@ -253,7 +253,7 @@ index 6d875b78b9..7422f361e4 100644
private void itemsCanBreakTurtleEggs() {
itemsCanBreakTurtleEggs = getBoolean("items-can-break-turtle-eggs", itemsCanBreakTurtleEggs);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3afcfeae11..df9e5c6593 100644
index 3afcfeae1..df9e5c659 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2068,4 +2068,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -279,7 +279,7 @@ index 3afcfeae11..df9e5c6593 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 92601c581c..185717c804 100644
index 92601c581..185717c80 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -128,6 +128,7 @@ public class ActivationRange