Spigot / CraftBukkit / b54b9409e02

Commits

md_5 authored b54b9409e02 27 Dec 2018

SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock

Modified

-7
++// CraftBukkit start
-8
++import org.bukkit.entity.LivingEntity;
-9
++import org.bukkit.event.entity.EntityCombustByEntityEvent;
-10
++import org.bukkit.event.entity.EntityCombustEvent;
-11
++import org.bukkit.event.player.PlayerPickupArrowEvent;
-12
++// CraftBukkit end
-13
++
-14
+ public abstract class EntityArrow extends Entity implements IProjectile {
-15
-16
+     private static final Predicate<Entity> g = IEntitySelector.f.and(IEntitySelector.a.and(Entity::isInteractable));
-+
+@@ -22,7 +29,7 @@
-+
+     public EntityArrow.PickupStatus fromPlayer;
-+
+     public int shake;
-+
+     public UUID shooter;
-+
+-    private int despawnCounter;
-+
++    public int despawnCounter; // PAIL
-+
+     private int aB;
-+
+     private double damage;
-+
+     public int knockbackStrength;
-26
+@@ -250,6 +257,7 @@
-27
+     }
-28
-29
+     protected void a(MovingObjectPosition movingobjectposition) {
-30
++        org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // CraftBukkit - Call event
-31
+         if (movingobjectposition.entity != null) {
-32
+             this.b(movingobjectposition);
-33
+         } else {
-34
+@@ -299,7 +307,13 @@
-35
+         }