twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Further fixes to fire events

Browse Source 
Moved lava ignition event into the correct position.
Spam should be reduced significantly.
This commit is contained in:
Andrew Ardill
2011-01-19 05:44:01 +08:00
committed by Warren
parent abc4b35bcd
commit eace2d0f8a
3 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/net/minecraft/server/BlockStationary.java
View File

@@ -1,9 +1,13 @@
package net.minecraft.server;
// CraftBukkit start
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
import org.bukkit.craftbukkit.CraftWorld;
import java.util.Random;
// CraftBukkit end
public class BlockStationary extends BlockFluids {
@@ -36,17 +40,6 @@ public class BlockStationary extends BlockFluids {
if (bt == Material.g) {
int j1 = random.nextInt(3);
// Craftbukkit start: prevent lava putting something on fire.
CraftServer server = ((WorldServer)world).getServer();
CraftWorld cworld = ((WorldServer)world).getWorld();
org.bukkit.block.Block bblock = (cworld.getBlockAt(k, l, i1));
BlockIgniteEvent event = new BlockIgniteEvent((org.bukkit.block.Block) bblock, BlockIgniteEvent.IgniteCause.LAVA, null);
server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
// Craftbukkit end
for (int k1 = 0; k1 < j1; k1++) {
k += random.nextInt(3) - 1;
l++;
@@ -54,7 +47,25 @@ public class BlockStationary extends BlockFluids {
int l1 = world.a(k, l, i1);
if (l1 == 0) {
// this checks if an adjacent block is flammable before lighting this block.
// perhaps we can reduce spam by checking this earlier.
if (j(world, k - 1, l, i1) || j(world, k + 1, l, i1) || j(world, k, l, i1 - 1) || j(world, k, l, i1 + 1) || j(world, k, l - 1, i1) || j(world, k, l + 1, i1)) {
// CraftBukkit start: prevent lava putting something on fire.
Server server = ((WorldServer)world).getServer();
CraftWorld cworld = ((WorldServer)world).getWorld();
org.bukkit.block.Block theBlock = cworld.getBlockAt(k, l, i1);
IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.LAVA;
Player thePlayer = null;
if (theBlock.getTypeId() != Block.ar.bi){
BlockIgniteEvent event = new BlockIgniteEvent(theBlock, igniteCause, thePlayer);
server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
continue;
}
}
// CraftBukkit end
world.e(k, l, i1, Block.ar.bi);
return;
}