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:
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

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>
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 6b28d84203..9cae7032fa 100644
index 78754c254e..266173096f 100644
--- a/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");
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.b(this, blockposition2, this.random);
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();
@@ -31,7 +31,7 @@ index 6b28d84203..9cae7032fa 100644
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);
if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 6b28d84203..9cae7032fa 100644
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);
if (iblockdata.getBlock() == nextticklistentry.b()) {