Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-27 00:22:46 +01:00
90 Zeilen
3.7 KiB
Diff
90 Zeilen
3.7 KiB
Diff
--- a/net/minecraft/server/EntitySkeleton.java
|
|
+++ b/net/minecraft/server/EntitySkeleton.java
|
|
@@ -2,13 +2,14 @@
|
|
|
|
import java.util.Calendar;
|
|
import javax.annotation.Nullable;
|
|
+import org.bukkit.event.entity.EntityCombustEvent; // CraftBukkit
|
|
|
|
public class EntitySkeleton extends EntityMonster implements IRangedEntity {
|
|
|
|
private static final DataWatcherObject<Integer> a = DataWatcher.a(EntitySkeleton.class, DataWatcherRegistry.b);
|
|
private static final DataWatcherObject<Boolean> b = DataWatcher.a(EntitySkeleton.class, DataWatcherRegistry.h);
|
|
private final PathfinderGoalBowShoot c = new PathfinderGoalBowShoot(this, 1.0D, 20, 15.0F);
|
|
- private final PathfinderGoalMeleeAttack bx = new PathfinderGoalMeleeAttack(this, 1.2D, flag) {
|
|
+ private final PathfinderGoalMeleeAttack bx = new PathfinderGoalMeleeAttack(this, 1.2D, false) { // CraftBukkit decompile error flag -> false
|
|
public void d() {
|
|
super.d();
|
|
EntitySkeleton.this.a(false);
|
|
@@ -105,7 +106,14 @@
|
|
}
|
|
|
|
if (flag) {
|
|
- this.setOnFire(8);
|
|
+ // CraftBukkit start
|
|
+ EntityCombustEvent event = new EntityCombustEvent(this.getBukkitEntity(), 8);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ this.setOnFire(event.getDuration());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
}
|
|
@@ -128,7 +136,7 @@
|
|
}
|
|
|
|
public void die(DamageSource damagesource) {
|
|
- super.die(damagesource);
|
|
+ // super.die(damagesource); // CraftBukkit
|
|
if (damagesource.i() instanceof EntityArrow && damagesource.getEntity() instanceof EntityHuman) {
|
|
EntityHuman entityhuman = (EntityHuman) damagesource.getEntity();
|
|
double d0 = entityhuman.locX - this.locX;
|
|
@@ -141,6 +149,7 @@
|
|
((EntityCreeper) damagesource.getEntity()).setCausedHeadDrop();
|
|
this.a(new ItemStack(Items.SKULL, 1, this.getSkeletonType() == EnumSkeletonType.WITHER ? 1 : 0), 0.0F);
|
|
}
|
|
+ super.die(damagesource); // CraftBukkit - moved from above
|
|
|
|
}
|
|
|
|
@@ -234,7 +243,14 @@
|
|
|
|
flag = flag || EnchantmentManager.a(Enchantments.ARROW_FIRE, (EntityLiving) this) > 0;
|
|
if (flag) {
|
|
- entitytippedarrow.setOnFire(100);
|
|
+ // CraftBukkit start - call EntityCombustEvent
|
|
+ EntityCombustEvent event = new EntityCombustEvent(entitytippedarrow.getBukkitEntity(), 100);
|
|
+ this.world.getServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ entitytippedarrow.setOnFire(event.getDuration());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
ItemStack itemstack = this.b(EnumHand.OFF_HAND);
|
|
@@ -245,8 +261,20 @@
|
|
entitytippedarrow.a(new MobEffect(MobEffects.SLOWER_MOVEMENT, 600));
|
|
}
|
|
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getItemInMainHand(), entitytippedarrow, 0.8F);
|
|
+ if (event.isCancelled()) {
|
|
+ event.getProjectile().remove();
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (event.getProjectile() == entitytippedarrow.getBukkitEntity()) {
|
|
+ world.addEntity(entitytippedarrow);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
this.a(SoundEffects.fz, 1.0F, 1.0F / (this.getRandom().nextFloat() * 0.4F + 0.8F));
|
|
- this.world.addEntity(entitytippedarrow);
|
|
+ // this.world.addEntity(entitytippedarrow); // CraftBukkit - moved up
|
|
}
|
|
|
|
public EnumSkeletonType getSkeletonType() {
|