Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18: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:
3cd952e2 Yank 0417-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch
c47cf32c Restore 0129-Optimize-World.isLoaded-BlockPosition-Z.patch
16071c7e Remove applied oversized chunks patch
cd499c92 Restore Use-getChunkIfLoadedImmediately-in-places.patch
7986f57e Bring back Reduce-sync-loads.patch (#2761)
9e58f226 Address gen concurrency issue causing crashes (Fixes #2746)
This commit is contained in:
William Blake Galbreath
2019-12-16 19:24:35 -06:00
parent 02eba92e93
commit 3984c3706f
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 8b25307b34...3cd952e225

2
current-paper
View File

@@ -1 +1 @@
1.15--6eec18ea9a00949432352a45822895c201e060e0 1.15--242585d44b7b5fe94235be94f9fd38a440b2b6dd

6
patches/server/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 350893286175492ce9dd02d807bb093b15bbd310 Mon Sep 17 00:00:00 2001 From 95ff0e54f1d111aecc87857dddd5ae493e811d01 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, 9 May 2019 18:09:43 -0500 Date: Thu, 9 May 2019 18:09:43 -0500
Subject: [PATCH] Purpur config files Subject: [PATCH] Purpur config files
@@ -57,7 +57,7 @@ index 3ed74ae0ec..8139108470 100644
// Paper end // Paper end
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 985f303726..46b0c68207 100644 index 2c92d3390a..97c4a6773a 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -96,6 +96,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -96,6 +96,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -69,7 +69,7 @@ index 985f303726..46b0c68207 100644
public final co.aikar.timings.WorldTimingsHandler timings; // Paper public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPosition lastPhysicsProblem; // Spigot public static BlockPosition lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter; private org.spigotmc.TickLimiter entityLimiter;
@@ -137,6 +139,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -145,6 +147,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray

6
patches/server/0034-Add-chance-for-zombie-horse-natural-spawns.patch
View File

@@ -1,4 +1,4 @@
From 633d6bcd11eb1d56f3e4a0176fa8d2feaa7e605c Mon Sep 17 00:00:00 2001 From 8274817a5714b4cf69bd350bb538be96e3b18d8f 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, 7 Jul 2019 19:52:16 -0500 Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Add chance for zombie horse natural spawns Subject: [PATCH] Add chance for zombie horse natural spawns
@@ -9,10 +9,10 @@ Subject: [PATCH] Add chance for zombie horse natural spawns
2 files changed, 17 insertions(+), 6 deletions(-) 2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 722384a91c..372b48fb2d 100644 index 3739a95c5a..79fa88549a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -525,12 +525,18 @@ public class WorldServer extends World { @@ -531,12 +531,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) { if (flag1) {

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

@@ -1,4 +1,4 @@
From e958f6fd32c2078f4f4d0f98513001f56a7b7095 Mon Sep 17 00:00:00 2001 From 023247dcf9fc86239935f562c73ffe2891d9a250 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
@@ -17,7 +17,7 @@ Subject: [PATCH] Implement AFK API
10 files changed, 113 insertions(+), 24 deletions(-) 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3d18c4eb60..95b580e80b 100644 index dee92e5a72..5e99ad8144 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/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 @@ -1374,6 +1374,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -49,7 +49,7 @@ index 886fbb7dff..2ec3e660b3 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 563bf54f8b..d58c91cfb7 100644 index 08f3a390eb..6de306628c 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
@@ -1581,8 +1581,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -1581,8 +1581,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -170,7 +170,7 @@ index 8d7273a38b..71c61dc45e 100644
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) { public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
double d4 = d3 * 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 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cdc81ff1e2..2e74e46d5d 100644 index a4af019bc6..2db59c55ca 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/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 { @@ -277,6 +277,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,10 +205,10 @@ index cdc81ff1e2..2e74e46d5d 100644
if (from.getX() != Double.MAX_VALUE) { if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone(); Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d5a0035124..6b28d84203 100644 index 79fa88549a..78754c254e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -360,7 +360,7 @@ public class WorldServer extends World { @@ -366,7 +366,7 @@ public class WorldServer extends World {
} }
if (this.C && this.players.stream().noneMatch((entityplayer) -> { if (this.C && this.players.stream().noneMatch((entityplayer) -> {
@@ -217,7 +217,7 @@ index d5a0035124..6b28d84203 100644
})) { })) {
this.C = false; this.C = false;
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) { if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
@@ -633,7 +633,7 @@ public class WorldServer extends World { @@ -639,7 +639,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) { while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next(); EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -287,7 +287,7 @@ index 712056cad1..c12d52e5df 100644
+ // Purpur end + // Purpur end
} }
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f86404f83a..5eeeb770e3 100644 index 92601c581c..185717c804 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -128,6 +128,7 @@ public class ActivationRange @@ -128,6 +128,7 @@ public class ActivationRange

12
patches/server/0067-Add-block-and-fluid-tick-events.patch
View File

@@ -1,4 +1,4 @@
From 9b9cdd9492b4232200094a3f1a45400311b1e527 Mon Sep 17 00:00:00 2001 From f5244669db2e3f7e914008169a3ac0173380ebf5 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 23:58:56 -0500 Date: Fri, 18 Oct 2019 23:58:56 -0500
Subject: [PATCH] Add block and fluid tick events Subject: [PATCH] Add block and fluid tick events
@@ -10,10 +10,10 @@ Subject: [PATCH] Add block and fluid tick events
3 files changed, 29 insertions(+), 2 deletions(-) 3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6b28d84203..9cae7032fa 100644 index 78754c254e..266173096f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -580,7 +580,7 @@ public class WorldServer extends World { @@ -586,7 +586,7 @@ public class WorldServer extends World {
gameprofilerfiller.enter("randomTick"); gameprofilerfiller.enter("randomTick");
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k); IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
@@ -22,7 +22,7 @@ index 6b28d84203..9cae7032fa 100644
iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809 iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
iblockdata.b(this, blockposition2, this.random); iblockdata.b(this, blockposition2, this.random);
iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809 iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
@@ -588,7 +588,7 @@ public class WorldServer extends World { @@ -594,7 +594,7 @@ public class WorldServer extends World {
Fluid fluid = iblockdata.getFluid(); Fluid fluid = iblockdata.getFluid();
@@ -31,7 +31,7 @@ index 6b28d84203..9cae7032fa 100644
fluid.b(this, blockposition2, this.random); fluid.b(this, blockposition2, this.random);
} }
@@ -677,6 +677,7 @@ public class WorldServer extends World { @@ -683,6 +683,7 @@ public class WorldServer extends World {
Fluid fluid = this.getFluid(nextticklistentry.a); Fluid fluid = this.getFluid(nextticklistentry.a);
if (fluid.getType() == nextticklistentry.b()) { if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 6b28d84203..9cae7032fa 100644
fluid.a((World) this, nextticklistentry.a); fluid.a((World) this, nextticklistentry.a);
} }
@@ -686,6 +687,7 @@ public class WorldServer extends World { @@ -692,6 +693,7 @@ public class WorldServer extends World {
IBlockData iblockdata = this.getType(nextticklistentry.a); IBlockData iblockdata = this.getType(nextticklistentry.a);
if (iblockdata.getBlock() == nextticklistentry.b()) { if (iblockdata.getBlock() == nextticklistentry.b()) {

6
patches/server/0071-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View File

@@ -1,4 +1,4 @@
From 5a47000c9ce9d1ac1213234eae21c92cb706e9e5 Mon Sep 17 00:00:00 2001 From 83a8863a58140ca0a8b24754ae3fa168042755d9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 01:42:50 -0500 Date: Sat, 19 Oct 2019 01:42:50 -0500
Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
2 files changed, 11 insertions(+), 4 deletions(-) 2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index d7f642858d..94664ea6c4 100644 index 97c4a6773a..2bf2d2e8cb 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1390,8 +1390,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1400,8 +1400,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
return blockposition; return blockposition;
} }