88 Zeilen
4.1 KiB
Diff
88 Zeilen
4.1 KiB
Diff
--- a/net/minecraft/server/EntityArrow.java
|
|
+++ b/net/minecraft/server/EntityArrow.java
|
|
@@ -5,6 +5,13 @@
|
|
import java.util.function.Predicate;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.entity.LivingEntity;
|
|
+import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
|
+import org.bukkit.event.entity.EntityCombustEvent;
|
|
+import org.bukkit.event.player.PlayerPickupArrowEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class EntityArrow extends Entity implements IProjectile {
|
|
|
|
private static final Predicate<Entity> f = IEntitySelector.e.and(IEntitySelector.a.and(Entity::isInteractable));
|
|
@@ -42,6 +49,7 @@
|
|
protected EntityArrow(EntityTypes<?> entitytypes, EntityLiving entityliving, World world) {
|
|
this(entitytypes, entityliving.locX, entityliving.locY + (double) entityliving.getHeadHeight() - 0.10000000149011612D, entityliving.locZ, world);
|
|
this.shooter = entityliving;
|
|
+ this.projectileSource = (LivingEntity) entityliving.getBukkitEntity(); // CraftBukkit
|
|
if (entityliving instanceof EntityHuman) {
|
|
this.fromPlayer = EntityArrow.PickupStatus.ALLOWED;
|
|
}
|
|
@@ -245,6 +253,7 @@
|
|
}
|
|
|
|
protected void a(MovingObjectPosition movingobjectposition) {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.callProjectileHitEvent(this, movingobjectposition); // CraftBukkit - Call event
|
|
if (movingobjectposition.entity != null) {
|
|
this.b(movingobjectposition);
|
|
} else {
|
|
@@ -293,7 +302,13 @@
|
|
}
|
|
|
|
if (this.isBurning() && !(entity instanceof EntityEnderman)) {
|
|
- entity.setOnFire(5);
|
|
+ // CraftBukkit start
|
|
+ EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
|
|
+ if (!combustEvent.isCancelled()) {
|
|
+ entity.setOnFire(combustEvent.getDuration());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
if (entity.damageEntity(damagesource, (float) i)) {
|
|
@@ -430,9 +445,22 @@
|
|
|
|
public void d(EntityHuman entityhuman) {
|
|
if (!this.world.isClientSide && (this.inGround || this.p()) && this.shake <= 0) {
|
|
+ // CraftBukkit start
|
|
+ ItemStack itemstack = this.getItemStack();
|
|
+ EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack);
|
|
+ if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) {
|
|
+ PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), (org.bukkit.entity.Arrow) this.getBukkitEntity());
|
|
+ // event.setCancelled(!entityhuman.canPickUpLoot); TODO
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild || this.p() && this.shooter == entityhuman;
|
|
|
|
- if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(this.getItemStack())) {
|
|
+ if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(item.getItemStack())) {
|
|
+ // CraftBukkit end
|
|
flag = false;
|
|
}
|
|
|
|
@@ -505,7 +533,14 @@
|
|
}
|
|
|
|
if (EnchantmentManager.a(Enchantments.ARROW_FIRE, entityliving) > 0) {
|
|
- this.setOnFire(100);
|
|
+ // CraftBukkit start - call EntityCombustEvent
|
|
+ EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 100);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ this.setOnFire(event.getDuration());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|