From 56bea4aa2394d22e31b992c3715a1b4c519f7320 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

---
 .../java/net/minecraft/server/WorldServer.java |  6 ++++--
 .../net/pl3x/purpur/PurpurWorldConfig.java     |  7 +++++++
 .../org/bukkit/craftbukkit/CraftWorld.java     | 18 ++++++++++++++++++
 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 5e51dbf172..dba8335554 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -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);
 
-                        if (iblockdata.q()) {
+                        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((World) this, blockposition2, this.random);
                             iblockdata.getBlock().randomTick = false; // Paper - fix MC-113809
@@ -581,7 +581,7 @@ public class WorldServer extends World {
 
                         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);
                         }
 
@@ -670,6 +670,7 @@ public class WorldServer extends World {
         Fluid fluid = this.getFluid(nextticklistentry.a);
 
         if (fluid.getType() == nextticklistentry.b()) {
+            if (purpurConfig.fluidTickEvent && !new net.pl3x.purpur.event.block.FluidTickEvent(getWorld(), nextticklistentry.a.x, nextticklistentry.a.y, nextticklistentry.a.z).callEvent()) return; // Purpur
             fluid.a((World) this, nextticklistentry.a);
         }
 
@@ -679,6 +680,7 @@ public class WorldServer extends World {
         IBlockData iblockdata = this.getType(nextticklistentry.a);
 
         if (iblockdata.getBlock() == nextticklistentry.b()) {
+            if (purpurConfig.blockTickEvent && !new net.pl3x.purpur.event.block.BlockTickEvent(getWorld(), nextticklistentry.a.x, nextticklistentry.a.y, nextticklistentry.a.z).callEvent()) return; // Purpur
             iblockdata.a((World) this, nextticklistentry.a, this.random);
         }
 
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f687444604..3ad3415c4a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -62,6 +62,13 @@ public class PurpurWorldConfig {
         return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
     }
 
+    public boolean blockTickEvent = false;
+    public boolean fluidTickEvent = false;
+    private void tickEvents() {
+        blockTickEvent = getBoolean("block-tick-events", false);
+        fluidTickEvent = getBoolean("fluid-tick-events", false);
+    }
+
     public boolean editableSigns = false;
     private void editableSigns() {
         editableSigns = getBoolean("editable-signs", editableSigns);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f33d9c8b44..ac7e16cdcc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2350,6 +2350,24 @@ public class CraftWorld implements World {
         return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList());
     }
 
+    // Purpur start
+    public boolean isBlockTickEventEnabled() {
+        return getHandle().purpurConfig.blockTickEvent;
+    }
+
+    public void setBlockTickEventEnabled(boolean enabled) {
+        getHandle().purpurConfig.blockTickEvent = enabled;
+    }
+
+    public boolean isFluidTickEventEnabled() {
+        return getHandle().purpurConfig.fluidTickEvent;
+    }
+
+    public void setFluidTickEventEnabled(boolean enabled) {
+        getHandle().purpurConfig.fluidTickEvent = enabled;
+    }
+    // Purpur end
+
     // Paper start
     @Override
     public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
-- 
2.24.0.rc1