Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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:
df984898 Fix server deadlock when loading some chunks (#2647)
9ea1f9ee performance improvement for CraftChunk.getEntities() (#2629)
This commit is contained in:
William Blake Galbreath
2019-10-20 04:06:49 -05:00
parent ff887573e2
commit da1de4da09
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 419ae0e668...df984898ac

2
current-paper
View File

@@ -1 +1 @@
1.14.4--5fd785d955d38ac3bcfcba830fc102b77d4388d8 1.14.4--c6ca20c40abd5ea29ec4e8a84c1bf8c26b64ccdb

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

@@ -1,4 +1,4 @@
From cde13052e3096ede841ba9340d858f455c39f0a7 Mon Sep 17 00:00:00 2001 From 030524325c17ca3149c46fd4640886dfc0a36865 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 6ade18914d..44729ae11a 100644 index 5b18f4bd52..62e938a78f 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
@@ -515,12 +515,18 @@ public class WorldServer extends World { @@ -518,12 +518,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) {

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

@@ -1,4 +1,4 @@
From 3d51b3ae4c5a605a6037aa6bec21c593859dfe24 Mon Sep 17 00:00:00 2001 From 932bc8077657edda8bc84b0ae54b86d7a54feae5 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
@@ -205,10 +205,10 @@ index 30595523e6..6f584d515f 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 44729ae11a..56133d54fa 100644 index 62e938a78f..5e51dbf172 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
@@ -356,7 +356,7 @@ public class WorldServer extends World { @@ -359,7 +359,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 44729ae11a..56133d54fa 100644
})) { })) {
this.C = false; this.C = false;
if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) { if (this.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE)) {
@@ -623,7 +623,7 @@ public class WorldServer extends World { @@ -626,7 +626,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) { while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next(); EntityPlayer entityplayer = (EntityPlayer) iterator.next();

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

@@ -1,4 +1,4 @@
From 217e5c6ce7a757f659a3546a6fe8af34d41e5ed9 Mon Sep 17 00:00:00 2001 From 34124c2ff2c977b830eb1b30a2d4ad418e0eadce 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 56133d54fa..8b82c19aeb 100644 index 5e51dbf172..dba8335554 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
@@ -570,7 +570,7 @@ public class WorldServer extends World { @@ -573,7 +573,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 56133d54fa..8b82c19aeb 100644
iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809 iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
iblockdata.b((World) this, blockposition2, this.random); iblockdata.b((World) this, blockposition2, this.random);
iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809 iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
@@ -578,7 +578,7 @@ public class WorldServer extends World { @@ -581,7 +581,7 @@ public class WorldServer extends World {
Fluid fluid = iblockdata.p(); Fluid fluid = iblockdata.p();
@@ -31,7 +31,7 @@ index 56133d54fa..8b82c19aeb 100644
fluid.b(this, blockposition2, this.random); fluid.b(this, blockposition2, this.random);
} }
@@ -667,6 +667,7 @@ public class WorldServer extends World { @@ -670,6 +670,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 56133d54fa..8b82c19aeb 100644
fluid.a((World) this, nextticklistentry.a); fluid.a((World) this, nextticklistentry.a);
} }
@@ -676,6 +677,7 @@ public class WorldServer extends World { @@ -679,6 +680,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()) {