Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Oops. Lets just put that back..

Browse Source
This commit is contained in:
William Blake Galbreath
2019-12-13 17:07:18 -06:00
parent 4d725d77b8
commit 7fd119319c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0067-Add-block-and-fluid-tick-events.patch
View File

@@ -1,28 +1,28 @@
From 5a63124266296c98b6ff07dfd11b9133476c01f8 Mon Sep 17 00:00:00 2001 From 9b9cdd9492b4232200094a3f1a45400311b1e527 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
--- ---
.../java/net/minecraft/server/WorldServer.java | 8 ++++---- .../java/net/minecraft/server/WorldServer.java | 6 ++++--
.../net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++ .../net/pl3x/purpur/PurpurWorldConfig.java | 7 +++++++
.../org/bukkit/craftbukkit/CraftWorld.java | 18 ++++++++++++++++++ .../org/bukkit/craftbukkit/CraftWorld.java | 18 ++++++++++++++++++
3 files changed, 29 insertions(+), 4 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 6b28d84203..9279a41b60 100644 index 6b28d84203..9cae7032fa 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
@@ -580,15 +580,13 @@ public class WorldServer extends World { @@ -580,7 +580,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);
- if (iblockdata.q()) { - if (iblockdata.q()) {
- iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
+ if (iblockdata.q() && (!purpurConfig.blockTickEvent || new net.pl3x.purpur.event.block.BlockTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur + if (iblockdata.q() && (!purpurConfig.blockTickEvent || new net.pl3x.purpur.event.block.BlockTickEvent(getWorld(), blockposition2.x, blockposition2.y, blockposition2.z, true).callEvent())) { // Purpur
iblockdata.getBlock().randomTick = true; // Paper - fix MC-113809
iblockdata.b(this, blockposition2, this.random); iblockdata.b(this, blockposition2, this.random);
- iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809 iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
} @@ -588,7 +588,7 @@ public class WorldServer extends World {
Fluid fluid = iblockdata.getFluid(); Fluid fluid = iblockdata.getFluid();
@@ -31,7 +31,7 @@ index 6b28d84203..9279a41b60 100644
fluid.b(this, blockposition2, this.random); fluid.b(this, blockposition2, this.random);
} }
@@ -677,6 +675,7 @@ public class WorldServer extends World { @@ -677,6 +677,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 6b28d84203..9279a41b60 100644
fluid.a((World) this, nextticklistentry.a); fluid.a((World) this, nextticklistentry.a);
} }
@@ -686,6 +685,7 @@ public class WorldServer extends World { @@ -686,6 +687,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()) {