craftbukkit/nms-patches/net/minecraft/world/entity/raid/EntityRaider.patch

39 lines
1.7 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/raid/EntityRaider.java
+++ b/net/minecraft/world/entity/raid/EntityRaider.java
2022-03-01 02:00:00 +11:00
@@ -165,7 +165,7 @@
MobEffect mobeffect1 = new MobEffect(MobEffects.BAD_OMEN, 120000, i, false, false, true);
2021-06-11 15:00:00 +10:00
if (!this.level.getGameRules().getBoolean(GameRules.RULE_DISABLE_RAIDS)) {
- entityhuman.addEffect(mobeffect1);
+ entityhuman.addEffect(mobeffect1, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.PATROL_CAPTAIN); // CraftBukkit
}
}
}
2022-03-01 02:00:00 +11:00
@@ -305,7 +305,7 @@
2021-06-11 15:00:00 +10:00
private final T mob;
- public b(EntityRaider entityraider) {
+ public b(T entityraider) { // CraftBukkit - decompile error
this.mob = entityraider;
2021-11-22 09:00:00 +11:00
this.setFlags(EnumSet.of(PathfinderGoal.Type.MOVE));
2021-06-11 15:00:00 +10:00
}
2022-03-01 02:00:00 +11:00
@@ -521,7 +521,7 @@
2019-04-23 12:00:00 +10:00
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
2021-11-22 09:00:00 +11:00
- entityraider.setTarget(this.mob.getTarget());
+ entityraider.setTarget(this.mob.getTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
2019-04-23 12:00:00 +10:00
}
}
2022-03-01 02:00:00 +11:00
@@ -538,7 +538,7 @@
2019-04-23 12:00:00 +10:00
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
2021-11-22 09:00:00 +11:00
- entityraider.setTarget(entityliving);
+ entityraider.setTarget(this.mob.getTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
2020-06-25 10:00:00 +10:00
entityraider.setAggressive(true);
2019-04-23 12:00:00 +10:00
}