SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Made fire spread trigger BlockSpreadEvent. Thanks N3X15!

Quellcode durchsuchen
Dieser Commit ist enthalten in:
EvilSeph 2011-07-14 23:15:09 -04:00
Ursprung 30a382a6dc
Commit 0bd535e054
1 geänderte Dateien mit 14 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

16
src/main/java/net/minecraft/server/BlockFire.java
Datei anzeigen

@ -6,6 +6,8 @@ import java.util.Random;
import org.bukkit.event.block.BlockIgniteEvent; import org.bukkit.event.block.BlockIgniteEvent;
import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockBurnEvent;
import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.material.MaterialData;
// CraftBukkit end // CraftBukkit end
public class BlockFire extends Block { public class BlockFire extends Block {
@ -91,7 +93,8 @@ public class BlockFire extends Block {
org.bukkit.World bworld = world.getWorld(); org.bukkit.World bworld = world.getWorld();
IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.SPREAD; IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.SPREAD;
// CraftBukkit org.bukkit.block.Block fromBlock = bworld.getBlockAt(i, j, k);
// CraftBukkit end
for (int i1 = i - 1; i1 <= i + 1; ++i1) { for (int i1 = i - 1; i1 <= i + 1; ++i1) {
for (int j1 = k - 1; j1 <= k + 1; ++j1) { for (int j1 = k - 1; j1 <= k + 1; ++j1) {
@ -125,7 +128,16 @@ public class BlockFire extends Block {
continue; continue;
} }
world.setTypeIdAndData(i1, k1, j1, this.id, k2); org.bukkit.block.BlockState blockState = bworld.getBlockAt(i1, k1, j1).getState();
blockState.setTypeId(this.id);
blockState.setData(new MaterialData(this.id, (byte) k2));
BlockSpreadEvent spreadEvent = new BlockSpreadEvent(blockState.getBlock(), fromBlock, blockState);
server.getPluginManager().callEvent(spreadEvent);
if (!spreadEvent.isCancelled()) {
blockState.update(true);
}
} }
// CraftBukkit end // CraftBukkit end
} }