SteamWar/Paper
10
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

12
paper-server/nms-patches/EntitySmallFireball.patch
View File

@@ -8,10 +8,10 @@
public class EntitySmallFireball extends EntityFireball {
public EntitySmallFireball(World world) {
@@ -10,6 +12,11 @@
@@ -8,6 +10,11 @@
public EntitySmallFireball(World world, EntityLiving entityliving, double d0, double d1, double d2) {
super(world, entityliving, d0, d1, d2);
this.setSize(0.3125F, 0.3125F);
super(EntityTypes.SMALL_FIREBALL, entityliving, d0, d1, d2, world, 0.3125F, 0.3125F);
+ // CraftBukkit start
+ if (this.shooter != null && this.shooter instanceof EntityInsentient) {
+ isIncendiary = this.world.getGameRules().getBoolean("mobGriefing");
@@ -20,7 +20,7 @@
}
public EntitySmallFireball(World world, double d0, double d1, double d2, double d3, double d4, double d5) {
@@ -27,10 +34,17 @@
@@ -20,10 +27,17 @@
if (movingobjectposition.entity != null) {
if (!movingobjectposition.entity.isFireProof()) {
@@ -41,7 +41,7 @@
}
}
} else {
@@ -39,11 +53,15 @@
@@ -32,11 +46,15 @@
flag = this.world.getGameRules().getBoolean("mobGriefing");
}
@@ -52,7 +52,7 @@
if (this.world.isEmpty(blockposition)) {
- this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this).isCancelled()) {
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition, this).isCancelled()) {
+ this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+ }
+ // CraftBukkit end