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

Update to Minecraft 1.14.3-pre4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-06-21 20:00:00 +10:00
parent 0297d9de8a
commit a8155d2399
109 changed files with 660 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,16 +14,16 @@
super(EntityTypes.SMALL_FIREBALL, entityliving, d0, d1, d2, world);
+ // CraftBukkit start
+ if (this.shooter != null && this.shooter instanceof EntityInsentient) {
+ isIncendiary = this.world.getGameRules().getBoolean("mobGriefing");
+ isIncendiary = this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING);
+ }
+ // CraftBukkit end
}
public EntitySmallFireball(World world, double d0, double d1, double d2, double d3, double d4, double d5) {
@@ -21,18 +28,27 @@
Entity entity = ((MovingObjectPositionEntity) movingobjectposition).getEntity();
@@ -23,7 +30,16 @@
if (!entity.isFireProof()) {
int i = entity.ad();
- entity.setOnFire(5);
+ // CraftBukkit start - Entity damage by entity event + combust event
+ if (isIncendiary) {
@@ -38,10 +38,11 @@
boolean flag = entity.damageEntity(DamageSource.fireball(this, this.shooter), 5.0F);
if (flag) {
this.a(this.shooter, entity);
@@ -32,11 +48,11 @@
entity.g(i);
}
}
- } else if (this.shooter == null || !(this.shooter instanceof EntityInsentient) || this.world.getGameRules().getBoolean("mobGriefing")) {
- } else if (this.shooter == null || !(this.shooter instanceof EntityInsentient) || this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
+ } else if (isIncendiary) { // CraftBukkit
MovingObjectPositionBlock movingobjectpositionblock = (MovingObjectPositionBlock) movingobjectposition;
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection());