SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
paper-server/nms-patches/FluidTypeLava.patch Normal file
View File

@@ -0,0 +1,44 @@
--- a/net/minecraft/server/FluidTypeLava.java
+++ b/net/minecraft/server/FluidTypeLava.java
@@ -35,6 +35,13 @@
if (iblockdata.isAir()) {
if (this.a((IWorldReader) world, blockposition1)) {
+ // CraftBukkit start - Prevent lava putting something on fire
+ if (world.getType(blockposition1) != Blocks.FIRE) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition1, blockposition).isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
world.setTypeUpdate(blockposition1, Blocks.FIRE.getBlockData());
return;
}
@@ -51,6 +58,14 @@
}
if (world.isEmpty(blockposition2.up()) && this.b(world, blockposition2)) {
+ // CraftBukkit start - Prevent lava putting something on fire
+ BlockPosition up = blockposition2.up();
+ if (world.getType(up) != Blocks.FIRE) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, up, blockposition).isCancelled()) {
+ continue;
+ }
+ }
+ // CraftBukkit end
world.setTypeUpdate(blockposition2.up(), Blocks.FIRE.getBlockData());
}
}
@@ -139,7 +154,11 @@
if (this.a(TagsFluid.b) && fluid1.a(TagsFluid.a)) {
if (iblockdata.getBlock() instanceof BlockFluids) {
- generatoraccess.setTypeAndData(blockposition, Blocks.STONE.getBlockData(), 3);
+ // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(generatoraccess.getMinecraftWorld(), blockposition, Blocks.STONE.getBlockData(), 3)) {
+ return;
+ }
+ // CraftBukkit end
}
this.a(generatoraccess, blockposition);