twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-20 23:03:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Mappings Update

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-26 08:00:00 +11:00
parent 239b2828db
commit d7e312278d
120 changed files with 878 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
paper-server/nms-patches/BlockFire.patch
View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/server/BlockFire.java
+++ b/net/minecraft/server/BlockFire.java
@@ -8,6 +8,16 @@
import java.util.function.Predicate;
@@ -7,6 +7,16 @@
import java.util.Map.Entry;
import javax.annotation.Nullable;
+// CraftBukkit start
@@ -17,7 +17,7 @@
public class BlockFire extends Block {
public static final BlockStateInteger AGE = BlockProperties.X;
@@ -32,7 +42,20 @@
@@ -31,7 +41,20 @@
}
public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) {
@@ -39,7 +39,7 @@
}
@Nullable
@@ -82,7 +105,7 @@
@@ -81,7 +104,7 @@
public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) {
if (world.getGameRules().getBoolean("doFireTick")) {
if (!iblockdata.canPlace(world, blockposition)) {
@@ -48,7 +48,7 @@
}
Block block = world.getType(blockposition.down()).getBlock();
@@ -90,7 +113,7 @@
@@ -89,7 +112,7 @@
int i = (Integer) iblockdata.get(BlockFire.AGE);
if (!flag && world.isRaining() && this.a(world, blockposition) && random.nextFloat() < 0.2F + (float) i * 0.03F) {
@@ -57,7 +57,7 @@
} else {
int j = Math.min(15, i + random.nextInt(3) / 2);
@@ -103,14 +126,14 @@
@@ -102,14 +125,14 @@
world.getBlockTickList().a(blockposition, this, this.a((IWorldReader) world) + random.nextInt(10));
if (!this.d(world, blockposition)) {
if (!world.getType(blockposition.down()).q() || i > 3) {
@@ -74,7 +74,7 @@
return;
}
}
@@ -118,12 +141,14 @@
@@ -117,12 +140,14 @@
boolean flag1 = world.x(blockposition);
int k = flag1 ? -50 : 0;
@@ -95,7 +95,7 @@
BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
for (int l = -1; l <= 1; ++l) {
@@ -149,7 +174,15 @@
@@ -148,7 +173,15 @@
if (i2 > 0 && random.nextInt(k1) <= i2 && (!world.isRaining() || !this.a(world, (BlockPosition) blockposition_mutableblockposition))) {
int j2 = Math.min(15, i + random.nextInt(5) / 4);
@@ -112,7 +112,7 @@
}
}
}
@@ -173,12 +206,24 @@
@@ -172,12 +205,24 @@
return this.flameChances.getInt(block);
}
@@ -138,7 +138,7 @@
if (random.nextInt(j + 10) < 5 && !world.isRainingAt(blockposition)) {
int l = Math.min(j + random.nextInt(5) / 4, 15);
@@ -241,7 +286,7 @@
@@ -240,7 +285,7 @@
if (iblockdata1.getBlock() != iblockdata.getBlock()) {
if (world.worldProvider.getDimensionManager() != DimensionManager.OVERWORLD && world.worldProvider.getDimensionManager() != DimensionManager.NETHER || !((BlockPortal) Blocks.NETHER_PORTAL).a((GeneratorAccess) world, blockposition)) {
if (!iblockdata.canPlace(world, blockposition)) {
@@ -147,7 +147,7 @@
} else {
world.getBlockTickList().a(blockposition, this, this.a((IWorldReader) world) + world.random.nextInt(10));
}
@@ -387,4 +432,12 @@
@@ -386,4 +431,12 @@
blockfire.a(Blocks.BLACK_CARPET, 60, 20);
blockfire.a(Blocks.DRIED_KELP_BLOCK, 30, 60);
}