diff options
author | Wesley Wolfe <weswolf@aol.com> | 2012-07-22 01:18:00 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2012-07-23 23:55:31 -0500 |
commit | b00de5f1768e14238f8660b63eb3fd5d744fc0a9 (patch) | |
tree | 2c1407b1ef81f38e16f3c4e453bec077dfd1eb53 /src/main/java/net/minecraft/server/BlockFire.java | |
parent | 8b9aad8c2b4057ab33a7bff2b8711d0d48c13568 (diff) | |
download | craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.gz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.lz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.tar.xz craftbukkit-b00de5f1768e14238f8660b63eb3fd5d744fc0a9.zip |
Cleaned up CraftBukkit comments in NMS.
Added newlines at the end of files
Fixed improper line endings on some files
Matched start - end comments
Added some missing comments for diffs
Fixed syntax on some spots
Minimized some diff
Removed some no longer used files
Added comment on some required files with no changes
Fixed imports of items used once
Added imports for items used more than once
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockFire.java')
-rw-r--r-- | src/main/java/net/minecraft/server/BlockFire.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java index 40c7e728..3a4ce881 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -3,12 +3,9 @@ package net.minecraft.server; import java.util.Random; // CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.block.BlockIgniteEvent; -import org.bukkit.event.block.BlockIgniteEvent.IgniteCause; import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockSpreadEvent; -import org.bukkit.material.MaterialData; // CraftBukkit end public class BlockFire extends Block { @@ -109,7 +106,7 @@ public class BlockFire extends Block { org.bukkit.Server server = world.getServer(); org.bukkit.World bworld = world.getWorld(); - IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.SPREAD; + BlockIgniteEvent.IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.SPREAD; org.bukkit.block.Block fromBlock = bworld.getBlockAt(i, j, k); // CraftBukkit end @@ -151,7 +148,7 @@ public class BlockFire extends Block { org.bukkit.block.BlockState blockState = bworld.getBlockAt(i1, k1, j1).getState(); blockState.setTypeId(this.id); - blockState.setData(new MaterialData(this.id, (byte) k2)); + blockState.setData(new org.bukkit.material.MaterialData(this.id, (byte) k2)); BlockSpreadEvent spreadEvent = new BlockSpreadEvent(blockState.getBlock(), fromBlock, blockState); server.getPluginManager().callEvent(spreadEvent); @@ -261,7 +258,7 @@ public class BlockFire extends Block { } // CraftBukkit start private void fireExtinguished(World world, int x, int y, int z) { - if (CraftEventFactory.callBlockFadeEvent(world.getWorld().getBlockAt(x, y, z), 0).isCancelled() == false) { + if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(world.getWorld().getBlockAt(x, y, z), 0).isCancelled() == false) { world.setTypeId(x, y, z, 0); } } |