59 lines
2.7 KiB
Diff
59 lines
2.7 KiB
Diff
--- a/net/minecraft/world/entity/raid/EntityRaider.java
|
|
+++ b/net/minecraft/world/entity/raid/EntityRaider.java
|
|
@@ -41,6 +41,10 @@
|
|
import net.minecraft.world.level.pathfinder.PathEntity;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class EntityRaider extends EntityMonsterPatrolling {
|
|
|
|
protected static final DataWatcherObject<Boolean> IS_CELEBRATING = DataWatcher.defineId(EntityRaider.class, DataWatcherRegistry.BOOLEAN);
|
|
@@ -236,7 +240,7 @@
|
|
this.onItemPickup(entityitem);
|
|
this.setItemSlot(enumitemslot, itemstack);
|
|
this.take(entityitem, itemstack.getCount());
|
|
- entityitem.discard();
|
|
+ entityitem.discard(EntityRemoveEvent.Cause.PICKUP); // CraftBukkit - add Bukkit remove cause
|
|
this.getCurrentRaid().setLeader(this.getWave(), this);
|
|
this.setPatrolLeader(true);
|
|
} else {
|
|
@@ -290,7 +294,7 @@
|
|
@Nullable
|
|
private EntityItem pursuedBannerItemEntity;
|
|
|
|
- public b(final EntityRaider entityraider) {
|
|
+ public b(final T entityraider) { // CraftBukkit - decompile error
|
|
this.mob = entityraider;
|
|
this.setFlags(EnumSet.of(PathfinderGoal.Type.MOVE));
|
|
}
|
|
@@ -524,7 +528,7 @@
|
|
private final float hostileRadiusSqr;
|
|
public final PathfinderTargetCondition shoutTargeting = PathfinderTargetCondition.forNonCombat().range(8.0D).ignoreLineOfSight().ignoreInvisibilityTesting();
|
|
|
|
- public a(final EntityRaider entityraider, final EntityIllagerAbstract entityillagerabstract, final float f) {
|
|
+ public a(final EntityIllagerAbstract entityillagerabstract, final float f) { // CraftBukkit - decompile error
|
|
this.mob = entityillagerabstract;
|
|
this.hostileRadiusSqr = f * f;
|
|
this.setFlags(EnumSet.of(PathfinderGoal.Type.MOVE, PathfinderGoal.Type.LOOK));
|
|
@@ -547,7 +551,7 @@
|
|
while (iterator.hasNext()) {
|
|
EntityRaider entityraider = (EntityRaider) iterator.next();
|
|
|
|
- entityraider.setTarget(this.mob.getTarget());
|
|
+ entityraider.setTarget(this.mob.getTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
|
|
}
|
|
|
|
}
|
|
@@ -564,7 +568,7 @@
|
|
while (iterator.hasNext()) {
|
|
EntityRaider entityraider = (EntityRaider) iterator.next();
|
|
|
|
- entityraider.setTarget(entityliving);
|
|
+ entityraider.setTarget(this.mob.getTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
|
|
entityraider.setAggressive(true);
|
|
}
|
|
|