Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

1.14.4 - Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9fe63a16 Update to 1.14.4 (#2333)
This commit is contained in:
William Blake Galbreath
2019-07-19 23:59:11 -05:00
parent 6ea93ffa52
commit c3fd092026
27 changed files with 351 additions and 3377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0030-Block-and-Fluid-Tick-Events.patch
View File

@@ -1,4 +1,4 @@
From bac1c8ce3da3e46925a266eca6be5b9c9c7e8b66 Mon Sep 17 00:00:00 2001
From dd63902c60c2ddef3553d15f59fce819d9d902ca Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 23:23:52 -0500
Subject: [PATCH] Block and Fluid Tick Events
@@ -10,10 +10,10 @@ Subject: [PATCH] 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 959fc99bb8..95d5cd1c66 100644
index 607e37cb91..5f82145723 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -447,13 +447,13 @@ public class WorldServer extends World {
@@ -445,13 +445,13 @@ public class WorldServer extends World {
gameprofilerfiller.enter("randomTick");
IBlockData iblockdata = chunksection.getType(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
@@ -22,14 +22,14 @@ index 959fc99bb8..95d5cd1c66 100644
iblockdata.b((World) this, blockposition2, this.random);
}
Fluid fluid = chunksection.b(blockposition2.getX() - j, blockposition2.getY() - j1, blockposition2.getZ() - k);
Fluid fluid = iblockdata.p();
- if (fluid.h()) {
+ if (fluid.h() && (!purpurConfig.fluidTickEvent || new net.pl3x.purpur.event.block.FluidTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur
fluid.b(this, blockposition2, this.random);
}
@@ -542,6 +542,7 @@ public class WorldServer extends World {
@@ -540,6 +540,7 @@ public class WorldServer extends World {
Fluid fluid = this.getFluid(nextticklistentry.a);
if (fluid.getType() == nextticklistentry.b()) {
@@ -37,7 +37,7 @@ index 959fc99bb8..95d5cd1c66 100644
fluid.a((World) this, nextticklistentry.a);
}
@@ -551,6 +552,7 @@ public class WorldServer extends World {
@@ -549,6 +550,7 @@ public class WorldServer extends World {
IBlockData iblockdata = this.getType(nextticklistentry.a);
if (iblockdata.getBlock() == nextticklistentry.b()) {
@@ -62,7 +62,7 @@ index 9dfba251ea..775d40ab1b 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f01e8a87e8..c5321c5076 100644
index d06716c006..48f3a784a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2336,6 +2336,24 @@ public class CraftWorld implements World {