Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 21:10:17 +01:00
Code Issues Projekte Releases Wiki Aktivität

[Bleeding] Call DamageEvent before CombustEvent for Arrows. Fixes BUKKIT-1100

Quellcode durchsuchen
Dieser Commit ist enthalten in:
feildmaster 2012-03-14 05:22:43 -05:00 committet von EvilSeph
Ursprung 3054d020d3
Commit b4c9ad518a
1 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

5
src/main/java/net/minecraft/server/EntityArrow.java
Datei anzeigen

@ -211,8 +211,9 @@ public class EntityArrow extends Entity {
damagesource = DamageSource.arrow(this, this.shooter); damagesource = DamageSource.arrow(this, this.shooter);
} }
// CraftBukkit start - moved damage call
if (movingobjectposition.entity.damageEntity(damagesource, l)) {
if (this.isBurning() && (!(movingobjectposition.entity instanceof EntityPlayer) || this.world.pvpMode)) { // CraftBukkit - abide by pvp setting if destination is a player. if (this.isBurning() && (!(movingobjectposition.entity instanceof EntityPlayer) || this.world.pvpMode)) { // CraftBukkit - abide by pvp setting if destination is a player.
// CraftBukkit start
EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5); EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
Bukkit.getPluginManager().callEvent(combustEvent); Bukkit.getPluginManager().callEvent(combustEvent);
@ -222,7 +223,7 @@ public class EntityArrow extends Entity {
// CraftBukkit end // CraftBukkit end
} }
if (movingobjectposition.entity.damageEntity(damagesource, l)) { //if (movingobjectposition.entity.damageEntity(damagesource, l)) { // CraftBukkit
if (movingobjectposition.entity instanceof EntityLiving) { if (movingobjectposition.entity instanceof EntityLiving) {
++((EntityLiving) movingobjectposition.entity).aI; ++((EntityLiving) movingobjectposition.entity).aI;
if (this.n > 0) { if (this.n > 0) {