Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-31 20:51:47 +01:00
Code Issues Projects Releases Wiki Activity

Add chests and soul sand to list of types falling blocks can collide with

Browse Source
This commit is contained in:
Byteflux 2015-08-04 17:24:47 -07:00
parent 6bcae0c948
commit c92053d8b0
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Disable-mood-sounds.patch
View File

@ -32,6 +32,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ disableMoodSounds = getBoolean( "disable-mood-sounds", false );
+ }
}
--
1.9.5.msysgit.1
--

7
Spigot-Server-Patches/FallingBlock-and-TNT-entities-collide-with-specific-.patch
View File

@ -15,8 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- block.getBlock().a(this, blockposition, block, axisalignedbb, arraylist, entity);
+ // PaperSpigot start - FallingBlocks and TNT collide with specific non-collidable blocks
+ Block b = block.getBlock();
+ if (entity.world.paperSpigotConfig.fallingBlocksCollideWithSigns && (entity instanceof EntityTNTPrimed || entity instanceof EntityFallingBlock) &&
+ (b instanceof BlockSign || b instanceof BlockFenceGate || b instanceof BlockTorch || b instanceof BlockButtonAbstract || b instanceof BlockLever || b instanceof BlockTripwireHook || b instanceof BlockTripwire)) {
+ if (entity.world.paperSpigotConfig.fallingBlocksCollideWithSigns && (entity instanceof EntityTNTPrimed || entity instanceof EntityFallingBlock) && (b instanceof BlockSign || b instanceof BlockFenceGate || b instanceof BlockTorch || b instanceof BlockButtonAbstract || b instanceof BlockLever || b instanceof BlockTripwireHook || b instanceof BlockTripwire || b instanceof BlockChest || b instanceof BlockSlowSand)) {
+ AxisAlignedBB aabb = AxisAlignedBB.a(x, y, z, x + 1.0, y + 1.0, z + 1.0);
+ if (axisalignedbb.b(aabb)) arraylist.add(aabb);
+ } else {
@ -41,6 +40,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ fallingBlocksCollideWithSigns = getBoolean( "falling-blocks-collide-with-signs", false );
+ }
}
--
1.9.5.msysgit.1
--