Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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:
5dc6bd45 Optimize call to getFluid for explosions (#2859)
0f795c3e Updated Upstream (CraftBukkit)
1d5bd44d Fix entity teleportation exceptions
bd0337b7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
654a1316 Add more chunk debug to watchdog (#2851)
This commit is contained in:
William Blake Galbreath
2020-01-14 19:46:20 -06:00
parent 6a70fc621d
commit e4b55a3da2
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: d94d6a2970...5dc6bd450e

2
current-paper
View File

@@ -1 +1 @@
1.15.1--4725c8bd69230be8a3e2ecfec2ecb3b38dd7f1a0
1.15.1--009d4a673c9f6f59a633ed599ec7a75b5e9f5450

6
patches/server/0010-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 4d5c94e0ea52dc2263cb38f10d14bbebae9c84e3 Mon Sep 17 00:00:00 2001
From 960b344bea7f6abfdc7a0ba38c2db059019dd5a0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -115,7 +115,7 @@ index 1d9ba04daa..2bade947ee 100644
this.d = false;
this.a.aK = this.a(this.a.aK, 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 647fc4b0e2..c40d3b56b1 100644
index cd3ea3359f..5e3b8278bb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -79,6 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -175,7 +175,7 @@ index 647fc4b0e2..c40d3b56b1 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3361,4 +3376,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3369,4 +3384,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}

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

@@ -1,4 +1,4 @@
From c4340b134f7c320cb3f98d3741fe777abe9f0703 Mon Sep 17 00:00:00 2001
From 8efdf76807baceb82e429ef9ac91dff672bed469 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 1ec29f157..2d2c916e5 100644
index 638d1469bd..bcab00c068 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1092,6 +1092,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1118,6 +1118,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index 1ec29f157..2d2c916e5 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a1ce2d2e0..213f7992d 100644
index a1ce2d2e07..213f7992dc 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 a1ce2d2e0..213f7992d 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 5eb86c434..8810a1120 100644
index 5eb86c4341..8810a1120b 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 5eb86c434..8810a1120 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 8bd887b1c..abd10a500 100644
index 8bd887b1c2..abd10a500a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -98,4 +98,9 @@ public class PurpurWorldConfig {

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

@@ -1,4 +1,4 @@
From e7dd733265b62aea814573a16366d94c82c89e2c Mon Sep 17 00:00:00 2001
From 16066e973580d0b1fc87d9f012fcfde6a914e644 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 2d2c916e5..8565ad9c7 100644
index bcab00c068..f7df54228d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1066,7 +1066,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1092,7 +1092,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 bc8b7d1ee0c0ad83ae767780dfeb5beb58a6d299 Mon Sep 17 00:00:00 2001
From 8a2bf04d29d12fb3d670201238c371031227ec52 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, 113 insertions(+), 24 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dee92e5a72..5e99ad8144 100644
index b9f678f26b..b502e589d4 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
@@ -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 8565ad9c76..50a922ff1b 100644
index f7df54228d..42bc1515e4 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1583,8 +1583,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1609,8 +1609,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();

12
patches/server/0098-Add-EntityPortalReadyEvent.patch
View File

@@ -1,4 +1,4 @@
From 8eddd9ec26a8ff2a6a8d0fc889d487807b9005bc Mon Sep 17 00:00:00 2001
From 66fd07748dbfff18e75f6026006e521c93cd13f5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 11 Jan 2020 23:12:52 -0600
Subject: [PATCH] Add EntityPortalReadyEvent
@@ -86,7 +86,7 @@ index 2dc3ab4cfa..1c0df77c2b 100644
break;
// CraftBukkit start - add the block to our list
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 5e99ad8144..42590e2977 100644
index b502e589d4..e5a64e07da 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -171,9 +171,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -111,7 +111,7 @@ index 5e99ad8144..42590e2977 100644
if (this instanceof EntityPlayer) {
((EntityPlayer) this).a(this.world.worldProvider.getDimensionManager().getType() == DimensionManager.NETHER ? DimensionManager.OVERWORLD : DimensionManager.NETHER, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL);
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index 25b694e7df..601af0efe4 100644
index b5f224e3b4..32b9ad3d81 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -11,6 +11,7 @@ public class PortalTravelAgent {
@@ -122,7 +122,7 @@ index 25b694e7df..601af0efe4 100644
public PortalTravelAgent(WorldServer worldserver) {
this.world = worldserver;
@@ -211,7 +212,7 @@ public class PortalTravelAgent {
@@ -233,7 +234,7 @@ public class PortalTravelAgent {
boolean flag1 = l2 < 0;
blockposition_mutableblockposition.d(j3, l3, i4);
@@ -131,7 +131,7 @@ index 25b694e7df..601af0efe4 100644
}
}
}
@@ -221,7 +222,7 @@ public class PortalTravelAgent {
@@ -243,7 +244,7 @@ public class PortalTravelAgent {
for (i3 = -1; i3 < 4; ++i3) {
if (k2 == -1 || k2 == 2 || i3 == -1 || i3 == 3) {
blockposition_mutableblockposition.d(i5 + k2 * k5, j5 + i3, j2 + k2 * l5);
@@ -141,7 +141,7 @@ index 25b694e7df..601af0efe4 100644
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 58d67168e8..f2f3ebd970 100644
index 53763216f0..ba8f62d112 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -65,7 +65,7 @@ public class WorldServer extends World {