Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/entity/raid/EntityRaider.java
+++ b/net/minecraft/world/entity/raid/EntityRaider.java
@@ -167,7 +167,7 @@
@@ -166,7 +166,7 @@
MobEffect mobeffect1 = new MobEffect(MobEffects.BAD_OMEN, 120000, i, false, false, true);
if (!this.level.getGameRules().getBoolean(GameRules.RULE_DISABLE_RAIDS)) {
@@ -9,30 +9,30 @@
}
}
}
@@ -307,7 +307,7 @@
@@ -306,7 +306,7 @@
private final T mob;
- public b(EntityRaider entityraider) {
+ public b(T entityraider) { // CraftBukkit - decompile error
this.mob = entityraider;
this.a(EnumSet.of(PathfinderGoal.Type.MOVE));
this.setFlags(EnumSet.of(PathfinderGoal.Type.MOVE));
}
@@ -523,7 +523,7 @@
@@ -522,7 +522,7 @@
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
- entityraider.setGoalTarget(this.mob.getGoalTarget());
+ entityraider.setGoalTarget(this.mob.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
- entityraider.setTarget(this.mob.getTarget());
+ entityraider.setTarget(this.mob.getTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
}
}
@@ -540,7 +540,7 @@
@@ -539,7 +539,7 @@
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
- entityraider.setGoalTarget(entityliving);
+ entityraider.setGoalTarget(this.mob.getGoalTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
- entityraider.setTarget(entityliving);
+ entityraider.setTarget(this.mob.getTarget(), org.bukkit.event.entity.EntityTargetEvent.TargetReason.FOLLOW_LEADER, true); // CraftBukkit
entityraider.setAggressive(true);
}