Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 02:47: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:
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

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>
Date: Fri, 18 Oct 2019 23:58:56 -0500
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(-)
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
+++ 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");
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.b((World) this, blockposition2, this.random);
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();
@@ -31,7 +31,7 @@ index 56133d54fa..8b82c19aeb 100644
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);
if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 56133d54fa..8b82c19aeb 100644
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);
if (iblockdata.getBlock() == nextticklistentry.b()) {