diff --git a/Spigot-Server-Patches/0003-mc-dev-imports.patch b/Spigot-Server-Patches/0003-mc-dev-imports.patch index e921bb0..cea6b61 100644 --- a/Spigot-Server-Patches/0003-mc-dev-imports.patch +++ b/Spigot-Server-Patches/0003-mc-dev-imports.patch @@ -1,4 +1,4 @@ -From e2c366725b828d0faaa28cafe8415936aeec51ef Mon Sep 17 00:00:00 2001 +From 1cafa672631362f4562ef151c7f66ce2130987e8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 25 May 2015 15:37:00 -0500 Subject: [PATCH] mc-dev imports @@ -850,6 +850,224 @@ index 0000000..29f8554 + + public void a_(World world, BlockPosition blockposition) {} +} +diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java +new file mode 100644 +index 0000000..b610450 +--- /dev/null ++++ b/src/main/java/net/minecraft/server/BlockFluids.java +@@ -0,0 +1,212 @@ ++package net.minecraft.server; ++ ++import java.util.Iterator; ++import java.util.Random; ++ ++public abstract class BlockFluids extends Block { ++ ++ public static final BlockStateInteger LEVEL = BlockStateInteger.of("level", 0, 15); ++ ++ protected BlockFluids(Material material) { ++ super(material); ++ this.j(this.blockStateList.getBlockData().set(BlockFluids.LEVEL, Integer.valueOf(0))); ++ this.a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); ++ this.a(true); ++ } ++ ++ public boolean b(IBlockAccess iblockaccess, BlockPosition blockposition) { ++ return this.material != Material.LAVA; ++ } ++ ++ public static float b(int i) { ++ if (i >= 8) { ++ i = 0; ++ } ++ ++ return (float) (i + 1) / 9.0F; ++ } ++ ++ protected int e(IBlockAccess iblockaccess, BlockPosition blockposition) { ++ return iblockaccess.getType(blockposition).getBlock().getMaterial() == this.material ? ((Integer) iblockaccess.getType(blockposition).get(BlockFluids.LEVEL)).intValue() : -1; ++ } ++ ++ protected int f(IBlockAccess iblockaccess, BlockPosition blockposition) { ++ int i = this.e(iblockaccess, blockposition); ++ ++ return i >= 8 ? 0 : i; ++ } ++ ++ public boolean d() { ++ return false; ++ } ++ ++ public boolean c() { ++ return false; ++ } ++ ++ public boolean a(IBlockData iblockdata, boolean flag) { ++ return flag && ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue() == 0; ++ } ++ ++ public boolean b(IBlockAccess iblockaccess, BlockPosition blockposition, EnumDirection enumdirection) { ++ Material material = iblockaccess.getType(blockposition).getBlock().getMaterial(); ++ ++ return material == this.material ? false : (enumdirection == EnumDirection.UP ? true : (material == Material.ICE ? false : super.b(iblockaccess, blockposition, enumdirection))); ++ } ++ ++ public AxisAlignedBB a(World world, BlockPosition blockposition, IBlockData iblockdata) { ++ return null; ++ } ++ ++ public int b() { ++ return 1; ++ } ++ ++ public Item getDropType(IBlockData iblockdata, Random random, int i) { ++ return null; ++ } ++ ++ public int a(Random random) { ++ return 0; ++ } ++ ++ protected Vec3D h(IBlockAccess iblockaccess, BlockPosition blockposition) { ++ Vec3D vec3d = new Vec3D(0.0D, 0.0D, 0.0D); ++ int i = this.f(iblockaccess, blockposition); ++ Iterator iterator = EnumDirection.EnumDirectionLimit.HORIZONTAL.iterator(); ++ ++ EnumDirection enumdirection; ++ BlockPosition blockposition1; ++ ++ while (iterator.hasNext()) { ++ enumdirection = (EnumDirection) iterator.next(); ++ blockposition1 = blockposition.shift(enumdirection); ++ int j = this.f(iblockaccess, blockposition1); ++ int k; ++ ++ if (j < 0) { ++ if (!iblockaccess.getType(blockposition1).getBlock().getMaterial().isSolid()) { ++ j = this.f(iblockaccess, blockposition1.down()); ++ if (j >= 0) { ++ k = j - (i - 8); ++ vec3d = vec3d.add((double) ((blockposition1.getX() - blockposition.getX()) * k), (double) ((blockposition1.getY() - blockposition.getY()) * k), (double) ((blockposition1.getZ() - blockposition.getZ()) * k)); ++ } ++ } ++ } else if (j >= 0) { ++ k = j - i; ++ vec3d = vec3d.add((double) ((blockposition1.getX() - blockposition.getX()) * k), (double) ((blockposition1.getY() - blockposition.getY()) * k), (double) ((blockposition1.getZ() - blockposition.getZ()) * k)); ++ } ++ } ++ ++ if (((Integer) iblockaccess.getType(blockposition).get(BlockFluids.LEVEL)).intValue() >= 8) { ++ iterator = EnumDirection.EnumDirectionLimit.HORIZONTAL.iterator(); ++ ++ while (iterator.hasNext()) { ++ enumdirection = (EnumDirection) iterator.next(); ++ blockposition1 = blockposition.shift(enumdirection); ++ if (this.b(iblockaccess, blockposition1, enumdirection) || this.b(iblockaccess, blockposition1.up(), enumdirection)) { ++ vec3d = vec3d.a().add(0.0D, -6.0D, 0.0D); ++ break; ++ } ++ } ++ } ++ ++ return vec3d.a(); ++ } ++ ++ public Vec3D a(World world, BlockPosition blockposition, Entity entity, Vec3D vec3d) { ++ return vec3d.e(this.h(world, blockposition)); ++ } ++ ++ public int a(World world) { ++ return this.material == Material.WATER ? 5 : (this.material == Material.LAVA ? (world.worldProvider.o() ? 10 : 30) : 0); ++ } ++ ++ public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) { ++ this.e(world, blockposition, iblockdata); ++ } ++ ++ public void doPhysics(World world, BlockPosition blockposition, IBlockData iblockdata, Block block) { ++ this.e(world, blockposition, iblockdata); ++ } ++ ++ public boolean e(World world, BlockPosition blockposition, IBlockData iblockdata) { ++ if (this.material == Material.LAVA) { ++ boolean flag = false; ++ EnumDirection[] aenumdirection = EnumDirection.values(); ++ int i = aenumdirection.length; ++ ++ for (int j = 0; j < i; ++j) { ++ EnumDirection enumdirection = aenumdirection[j]; ++ ++ if (enumdirection != EnumDirection.DOWN && world.getType(blockposition.shift(enumdirection)).getBlock().getMaterial() == Material.WATER) { ++ flag = true; ++ break; ++ } ++ } ++ ++ if (flag) { ++ Integer integer = (Integer) iblockdata.get(BlockFluids.LEVEL); ++ ++ if (integer.intValue() == 0) { ++ world.setTypeUpdate(blockposition, Blocks.OBSIDIAN.getBlockData()); ++ this.fizz(world, blockposition); ++ return true; ++ } ++ ++ if (integer.intValue() <= 4) { ++ world.setTypeUpdate(blockposition, Blocks.COBBLESTONE.getBlockData()); ++ this.fizz(world, blockposition); ++ return true; ++ } ++ } ++ } ++ ++ return false; ++ } ++ ++ protected void fizz(World world, BlockPosition blockposition) { ++ double d0 = (double) blockposition.getX(); ++ double d1 = (double) blockposition.getY(); ++ double d2 = (double) blockposition.getZ(); ++ ++ world.makeSound(d0 + 0.5D, d1 + 0.5D, d2 + 0.5D, "random.fizz", 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F); ++ ++ for (int i = 0; i < 8; ++i) { ++ world.addParticle(EnumParticle.SMOKE_LARGE, d0 + Math.random(), d1 + 1.2D, d2 + Math.random(), 0.0D, 0.0D, 0.0D, new int[0]); ++ } ++ ++ } ++ ++ public IBlockData fromLegacyData(int i) { ++ return this.getBlockData().set(BlockFluids.LEVEL, Integer.valueOf(i)); ++ } ++ ++ public int toLegacyData(IBlockData iblockdata) { ++ return ((Integer) iblockdata.get(BlockFluids.LEVEL)).intValue(); ++ } ++ ++ protected BlockStateList getStateList() { ++ return new BlockStateList(this, new IBlockState[] { BlockFluids.LEVEL}); ++ } ++ ++ public static BlockFlowing a(Material material) { ++ if (material == Material.WATER) { ++ return Blocks.FLOWING_WATER; ++ } else if (material == Material.LAVA) { ++ return Blocks.FLOWING_LAVA; ++ } else { ++ throw new IllegalArgumentException("Invalid material"); ++ } ++ } ++ ++ public static BlockStationary b(Material material) { ++ if (material == Material.WATER) { ++ return Blocks.WATER; ++ } else if (material == Material.LAVA) { ++ return Blocks.LAVA; ++ } else { ++ throw new IllegalArgumentException("Invalid material"); ++ } ++ } ++} diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java new file mode 100644 index 0000000..d1e10c6 @@ -2287,5 +2505,5 @@ index 0000000..f75e2de + } +} -- -2.4.5.windows.1 +2.4.6.windows.1 diff --git a/Spigot-Server-Patches/0071-Fix-lava-water-some-times-creating-air-instead-of-co.patch b/Spigot-Server-Patches/0071-Fix-lava-water-some-times-creating-air-instead-of-co.patch new file mode 100644 index 0000000..7c38ed2 --- /dev/null +++ b/Spigot-Server-Patches/0071-Fix-lava-water-some-times-creating-air-instead-of-co.patch @@ -0,0 +1,22 @@ +From 4d013f6903f9ed1106967f8ae5121589277f0ebd Mon Sep 17 00:00:00 2001 +From: Iceee +Date: Tue, 4 Aug 2015 18:15:05 -0700 +Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone + + +diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java +index b610450..db73f5d 100644 +--- a/src/main/java/net/minecraft/server/BlockFluids.java ++++ b/src/main/java/net/minecraft/server/BlockFluids.java +@@ -154,7 +154,7 @@ public abstract class BlockFluids extends Block { + return true; + } + +- if (integer.intValue() <= 4) { ++ if (integer.intValue() > 0) { // PaperSpigot + world.setTypeUpdate(blockposition, Blocks.COBBLESTONE.getBlockData()); + this.fizz(world, blockposition); + return true; +-- +2.4.6.windows.1 +