Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-29 15:07:34 +02:00
Code Issues Projects Releases Wiki Activity

Change some block == AIR checks to isAir to catch CAVE_AIR

Browse Source
This commit is contained in:
md_5 2020-01-27 10:09:46 +11:00
parent e911c70f85
commit 10763a88ba
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/Entity.patch
View File

@ -224,7 +224,7 @@
+ bl = bl.getRelative(BlockFace.NORTH); + bl = bl.getRelative(BlockFace.NORTH);
+ } + }
+ +
+ if (bl.getType() != org.bukkit.Material.AIR) { + if (!bl.getType().isAir()) {
+ VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl); + VehicleBlockCollisionEvent event = new VehicleBlockCollisionEvent(vehicle, bl);
+ world.getServer().getPluginManager().callEvent(event); + world.getServer().getPluginManager().callEvent(event);
+ } + }

2
nms-patches/EntityEnderDragon.patch
View File

@ -95,7 +95,7 @@
+ } else { + } else {
+ for (org.bukkit.block.Block block : event.blockList()) { + for (org.bukkit.block.Block block : event.blockList()) {
+ org.bukkit.Material blockId = block.getType(); + org.bukkit.Material blockId = block.getType();
+ if (blockId == org.bukkit.Material.AIR) { + if (blockId.isAir()) {
+ continue; + continue;
+ } + }
+ +

2
nms-patches/Explosion.patch
View File

@ -80,7 +80,7 @@
+ for (int i1 = this.blocks.size() - 1; i1 >= 0; i1--) { + for (int i1 = this.blocks.size() - 1; i1 >= 0; i1--) {
+ BlockPosition cpos = (BlockPosition) this.blocks.get(i1); + BlockPosition cpos = (BlockPosition) this.blocks.get(i1);
+ org.bukkit.block.Block bblock = bworld.getBlockAt(cpos.getX(), cpos.getY(), cpos.getZ()); + org.bukkit.block.Block bblock = bworld.getBlockAt(cpos.getX(), cpos.getY(), cpos.getZ());
+ if (bblock.getType() != org.bukkit.Material.AIR) { + if (!bblock.getType().isAir()) {
+ blockList.add(bblock); + blockList.add(bblock);
+ } + }
+ } + }