mirror of
https://github.com/barkeser2002/CatServer.git
synced 2026-09-25 05:19:55 +03:00
59 lines
3.4 KiB
Diff
59 lines
3.4 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockMycelium.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockMycelium.java
|
|
@@ -16,6 +16,10 @@
|
|
import net.minecraft.world.World;
|
|
import net.minecraftforge.fml.relauncher.Side;
|
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
|
+import org.bukkit.block.BlockState;
|
|
+import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
|
+import org.bukkit.event.block.BlockFadeEvent;
|
|
+import org.bukkit.event.block.BlockSpreadEvent;
|
|
|
|
public class BlockMycelium extends Block
|
|
{
|
|
@@ -39,9 +43,20 @@
|
|
{
|
|
if (!worldIn.isRemote)
|
|
{
|
|
- if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getBlockState(pos.up()).getLightOpacity() > 2)
|
|
+ if (!worldIn.isAreaLoaded(pos, 2)) return; // Forge: prevent loading unloaded chunks when checking neighbor's light and spreading
|
|
+ if (worldIn.getLightFromNeighbors(pos.up()) < 4 && worldIn.getBlockState(pos.up()).getLightOpacity(worldIn, pos.up()) > 2)
|
|
{
|
|
- worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
|
|
+// worldIn.setBlockState(pos, Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
|
|
+ org.bukkit.World bworld = worldIn.getWorld();
|
|
+ BlockState blockState = bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()).getState();
|
|
+ blockState.setType(CraftMagicNumbers.getMaterial(Blocks.DIRT));
|
|
+
|
|
+ BlockFadeEvent event = new BlockFadeEvent(blockState.getBlock(), blockState);
|
|
+ worldIn.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ blockState.update(true);
|
|
+ }
|
|
}
|
|
else
|
|
{
|
|
@@ -53,9 +68,19 @@
|
|
IBlockState iblockstate = worldIn.getBlockState(blockpos);
|
|
IBlockState iblockstate1 = worldIn.getBlockState(blockpos.up());
|
|
|
|
- if (iblockstate.getBlock() == Blocks.DIRT && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && worldIn.getLightFromNeighbors(blockpos.up()) >= 4 && iblockstate1.getLightOpacity() <= 2)
|
|
+ if (iblockstate.getBlock() == Blocks.DIRT && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && worldIn.getLightFromNeighbors(blockpos.up()) >= 4 && iblockstate1.getLightOpacity(worldIn, blockpos.up()) <= 2)
|
|
{
|
|
- worldIn.setBlockState(blockpos, this.getDefaultState());
|
|
+// worldIn.setBlockState(blockpos, this.getDefaultState());
|
|
+ org.bukkit.World bworld = worldIn.getWorld();
|
|
+ BlockState blockState = bworld.getBlockAt(blockpos.getX(), blockpos.getY(), blockpos.getZ()).getState();
|
|
+ blockState.setType(CraftMagicNumbers.getMaterial(this));
|
|
+
|
|
+ BlockSpreadEvent event = new BlockSpreadEvent(blockState.getBlock(), bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()), blockState);
|
|
+ worldIn.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ blockState.update(true);
|
|
+ }
|
|
}
|
|
}
|
|
}
|