summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/BlockFire.java20
-rw-r--r--src/main/java/net/minecraft/server/BlockStationary.java35
-rw-r--r--src/main/java/net/minecraft/server/ItemFlintAndSteel.java34
3 files changed, 57 insertions, 32 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
index 1af4437e..d3c8e396 100644
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -1,13 +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.event.block.BlockIgniteEvent.IgniteCause;
-import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
import java.util.Random;
-
+// CraftBukkit end
public class BlockFire extends Block {
@@ -86,20 +86,22 @@ public class BlockFire extends Block {
}
int i2 = h(world, i1, k1, j1);
- //CraftBukkit start: Call to stop spead of fire.
+ // CraftBukkit start: Call to stop spread of fire.
Server server = ((WorldServer)world).getServer();
CraftWorld cworld = ((WorldServer)world).getWorld();
org.bukkit.block.Block theBlock = (cworld.getBlockAt(i1, j1, k1));
+ IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.SPREAD;
+ Player thePlayer = null;
if (theBlock.getTypeId() != Block.ar.bi){
- BlockIgniteEvent event = new BlockIgniteEvent(theBlock, BlockIgniteEvent.IgniteCause.SPREAD, null);
+ BlockIgniteEvent event = new BlockIgniteEvent(theBlock, igniteCause, thePlayer);
server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
}
- //CraftBukkit end
+ // CraftBukkit end
if (i2 > 0 && random.nextInt(l1) <= i2) {
world.e(i1, k1, j1, bi);
}
@@ -121,15 +123,17 @@ public class BlockFire extends Block {
CraftWorld cworld = ((WorldServer)world).getWorld();
org.bukkit.block.Block theBlock = (cworld.getBlockAt(i, j, k));
+ IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.SLOW_SPREAD;
+ Player thePlayer = null;
if (theBlock.getTypeId() != Block.ar.bi){
- BlockIgniteEvent event = new BlockIgniteEvent(theBlock, BlockIgniteEvent.IgniteCause.SLOW_SPREAD, null);
+ BlockIgniteEvent event = new BlockIgniteEvent(theBlock, igniteCause, thePlayer);
server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
}
- //CraftBukkit end
+ // CraftBukkit end
world.e(i, j, k, bi);
} else {
world.e(i, j, k, 0);
@@ -219,4 +223,4 @@ public class BlockFire extends Block {
return;
}
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/net/minecraft/server/BlockStationary.java b/src/main/java/net/minecraft/server/BlockStationary.java
index 132cc991..3d4fe19d 100644
--- a/src/main/java/net/minecraft/server/BlockStationary.java
+++ b/src/main/java/net/minecraft/server/BlockStationary.java
@@ -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;
}
diff --git a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
index ff46663d..cd54a2b7 100644
--- a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
+++ b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
@@ -3,12 +3,16 @@ package net.minecraft.server;
import java.util.Random;
// CraftBukkit start
+import org.bukkit.Server;
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.craftbukkit.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
import org.bukkit.event.Event.Type;
import org.bukkit.event.player.PlayerItemEvent;
import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
// CraftBukkit end
public class ItemFlintAndSteel extends Item {
@@ -20,9 +24,6 @@ public class ItemFlintAndSteel extends Item {
}
public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) {
- // CraftBukkit - get the clicked block
- CraftBlock blockClicked = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k);
-
if (l == 0) {
j--;
}
@@ -45,17 +46,26 @@ public class ItemFlintAndSteel extends Item {
if (i1 == 0) {
// CraftBukkit start - Flint and steel
- CraftItemStack itemInHand = new CraftItemStack(itemstack);
- CraftPlayer thePlayer = new CraftPlayer(((WorldServer) world).getServer(), (EntityPlayerMP) entityplayer);
- PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l));
- ((WorldServer) world).getServer().getPluginManager().callEvent(pie);
+ Server server = ((WorldServer)world).getServer();
+ CraftWorld cworld = ((WorldServer)world).getWorld();
- org.bukkit.block.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k));
- BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.block.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer);
- ((WorldServer) world).getServer().getPluginManager().callEvent(bie);
+ Type eventType = Type.PLAYER_ITEM;
+ Player thePlayer = (Player) entityplayer.getBukkitEntity();
+ CraftItemStack itemInHand = new CraftItemStack(itemstack);
+ org.bukkit.block.Block blockClicked = cworld.getBlockAt(i, j, k);
+ BlockFace blockFace = CraftBlock.notchToBlockFace(l);
+
+ PlayerItemEvent pie = new PlayerItemEvent(eventType, thePlayer, itemInHand, blockClicked, blockFace);
+ server.getPluginManager().callEvent(pie);
boolean preventLighter = pie.isCancelled();
- boolean preventFire = bie.isCancelled();
+ boolean preventFire = false;
+ if (blockClicked.getTypeId() != Block.ar.bi){
+ IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL;
+ BlockIgniteEvent bie = new BlockIgniteEvent(blockClicked, igniteCause, thePlayer);
+ server.getPluginManager().callEvent(bie);
+ preventFire = bie.isCancelled();
+ }
if (preventLighter || preventFire) {
return false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:51:01 +0000