mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-15 04:05:50 -07:00
Updated against new mc-dev format, takes out quite some casting troubles at the cost of extra ()'s
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
package net.minecraft.server;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
// CraftBukkit start
|
||||
import org.bukkit.craftbukkit.CraftBlock;
|
||||
import org.bukkit.craftbukkit.CraftItemStack;
|
||||
import org.bukkit.craftbukkit.CraftPlayer;
|
||||
import org.bukkit.event.Event.Type;
|
||||
import org.bukkit.event.player.PlayerItemEvent;
|
||||
import org.bukkit.event.block.BlockIgniteEvent;
|
||||
|
||||
// CraftBukkit end
|
||||
|
||||
public class ItemFlintAndSteel extends Item {
|
||||
|
||||
@@ -17,9 +20,9 @@ public class ItemFlintAndSteel extends Item {
|
||||
}
|
||||
|
||||
public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, int i, int j, int k, int l) {
|
||||
// Craftbukkit start - get the clicked block
|
||||
// CraftBukkit - get the clicked block
|
||||
CraftBlock blockClicked = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k);
|
||||
|
||||
|
||||
if (l == 0) {
|
||||
j--;
|
||||
}
|
||||
@@ -41,30 +44,28 @@ public class ItemFlintAndSteel extends Item {
|
||||
int i1 = world.a(i, j, k);
|
||||
|
||||
if (i1 == 0) {
|
||||
// Craftbukkit start
|
||||
// Flint and steel
|
||||
|
||||
// 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);
|
||||
|
||||
|
||||
org.bukkit.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k));
|
||||
BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer);
|
||||
((WorldServer) world).getServer().getPluginManager().callEvent(bie);
|
||||
|
||||
boolean preventLighter = pie.isCancelled();
|
||||
boolean preventFire = bie.isCancelled();
|
||||
|
||||
|
||||
if (preventLighter || preventFire) {
|
||||
return false;
|
||||
} else {
|
||||
world.a((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "fire.ignite", 1.0F, b.nextFloat() * 0.4F + 0.8F);
|
||||
world.d(i, j, k, Block.ar.bh);
|
||||
}
|
||||
// CraftBukkit end
|
||||
|
||||
world.a((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "fire.ignite", 1.0F, b.nextFloat() * 0.4F + 0.8F);
|
||||
world.d(i, j, k, Block.ar.bh);
|
||||
}
|
||||
itemstack.b(1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user