Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17: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:
d94d6a29 Optimise IEntityAccess#getPlayerByUUID (#2842)
4237539e Guard against serializing mismatching chunk coordinate (#2844)
c1f57657 Updated Upstream (CraftBukkit)
f5569fd3 Fix SkullMeta.setPlayerProfile() (#2833)
2f527126 Update upstream CB
4151617d Update no chunk loads for hoppers and double chests patch (#2777)
d224bc03 [CI-SKIP] Passage outdated (#2776)
db3af11c Fix race condition with regionfile being closed right after getting one (#2812)
a817508f [CI-SKIP] Update dependency version in README.md (#2817)
9aeba7c9 Prevent bees loading chunks checking hive position (#2828)
This commit is contained in:
William Blake Galbreath
2020-01-12 05:02:57 -06:00
parent f0b888053b
commit 7760fa6dfb
18 changed files with 120 additions and 183 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 12219d4512c64cfd4c3f8cab42083202698c5b31 Mon Sep 17 00:00:00 2001
From 87e96f6f24a83d3296935af1d348dc4237296d67 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 84c0693303..8ae7b7784c 100644
index bc02c54526..58d67168e8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -595,7 +595,7 @@ public class WorldServer extends World {
@@ -604,7 +604,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 84c0693303..8ae7b7784c 100644
iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
iblockdata.b(this, blockposition2, this.random);
iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
@@ -603,7 +603,7 @@ public class WorldServer extends World {
@@ -612,7 +612,7 @@ public class WorldServer extends World {
Fluid fluid = iblockdata.getFluid();
@@ -31,7 +31,7 @@ index 84c0693303..8ae7b7784c 100644
fluid.b(this, blockposition2, this.random);
}
@@ -692,6 +692,7 @@ public class WorldServer extends World {
@@ -701,6 +701,7 @@ public class WorldServer extends World {
Fluid fluid = this.getFluid(nextticklistentry.a);
if (fluid.getType() == nextticklistentry.b()) {
@@ -39,7 +39,7 @@ index 84c0693303..8ae7b7784c 100644
fluid.a((World) this, nextticklistentry.a);
}
@@ -701,6 +702,7 @@ public class WorldServer extends World {
@@ -710,6 +711,7 @@ public class WorldServer extends World {
IBlockData iblockdata = this.getType(nextticklistentry.a);
if (iblockdata.getBlock() == nextticklistentry.b()) {