summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockStationary.patch
blob: 4f9bbe2037c01b9a4b7fcefd7c73c4f0e14b6e6b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- a/net/minecraft/server/BlockStationary.java
+++ b/net/minecraft/server/BlockStationary.java
@@ -2,6 +2,8 @@
 
 import java.util.Random;
 
+import org.bukkit.craftbukkit.event.CraftEventFactory;  // CraftBukkit
+
 public class BlockStationary extends BlockFluids {
 
     protected BlockStationary(Material material) {
@@ -45,6 +47,13 @@
 
                         if (block.material == Material.AIR) {
                             if (this.c(world, blockposition1)) {
+                                 // CraftBukkit start - Prevent lava putting something on fire
+                                if (world.getType(blockposition1) != Blocks.FIRE) {
+                                    if (CraftEventFactory.callBlockIgniteEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), blockposition.getX(), blockposition.getY(), blockposition.getZ()).isCancelled()) {
+                                        continue;
+                                    }
+                                }
+                                // CraftBukkit end
                                 world.setTypeUpdate(blockposition1, Blocks.FIRE.getBlockData());
                                 return;
                             }
@@ -60,7 +69,16 @@
                             return;
                         }
 
+                        // PAIL: rename
                         if (world.isEmpty(blockposition2.up()) && this.d(world, blockposition2)) {
+                            // CraftBukkit start - Prevent lava putting something on fire
+                            BlockPosition up = blockposition2.up();
+                            if (world.getType(up) != Blocks.FIRE) {
+                                if (CraftEventFactory.callBlockIgniteEvent(world, up.getX(), up.getY(), up.getZ(), blockposition.getX(), blockposition.getY(), blockposition.getZ()).isCancelled()) {
+                                    continue;
+                                }
+                            }
+                            // CraftBukkit end
                             world.setTypeUpdate(blockposition2.up(), Blocks.FIRE.getBlockData());
                         }
                     }