Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 04:25:26 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-5405: Use correct damage source for HangingBreakByEntityEvent

Browse Source
This commit is contained in:
Brokkonaut 2019-11-28 06:31:04 +01:00 committed by md_5
parent ccd47a503a
commit eafd74240d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nms-patches/EntityHanging.patch
View File

@ -108,16 +108,17 @@
this.die(); this.die();
this.a((Entity) null); this.a((Entity) null);
} }
@@ -139,6 +175,21 @@ @@ -139,6 +175,22 @@
return false; return false;
} else { } else {
if (!this.dead && !this.world.isClientSide) { if (!this.dead && !this.world.isClientSide) {
+ // CraftBukkit start - fire break events + // CraftBukkit start - fire break events
+ HangingBreakEvent event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.DEFAULT); + Entity damager = (damagesource instanceof EntityDamageSourceIndirect) ? ((EntityDamageSourceIndirect) damagesource).getProximateDamageSource() : damagesource.getEntity();
+ if (damagesource.getEntity() != null) { + HangingBreakEvent event;
+ event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damagesource.getEntity() == null ? null : damagesource.getEntity().getBukkitEntity(), damagesource.isExplosion() ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY); + if (damager != null) {
+ } else if (damagesource.isExplosion()) { + event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damager.getBukkitEntity(), damagesource.isExplosion() ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY);
+ event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.EXPLOSION); + } else {
+ event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), damagesource.isExplosion() ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.DEFAULT);
+ } + }
+ +
+ this.world.getServer().getPluginManager().callEvent(event); + this.world.getServer().getPluginManager().callEvent(event);
@ -130,7 +131,7 @@
this.die(); this.die();
this.velocityChanged(); this.velocityChanged();
this.a(damagesource.getEntity()); this.a(damagesource.getEntity());
@@ -151,6 +202,18 @@ @@ -151,6 +203,18 @@
@Override @Override
public void move(EnumMoveType enummovetype, Vec3D vec3d) { public void move(EnumMoveType enummovetype, Vec3D vec3d) {
if (!this.world.isClientSide && !this.dead && vec3d.g() > 0.0D) { if (!this.world.isClientSide && !this.dead && vec3d.g() > 0.0D) {
@ -149,7 +150,7 @@
this.die(); this.die();
this.a((Entity) null); this.a((Entity) null);
} }
@@ -159,7 +222,7 @@ @@ -159,7 +223,7 @@
@Override @Override
public void f(double d0, double d1, double d2) { public void f(double d0, double d1, double d2) {