Update to Minecraft 1.21.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-10-23 02:15:00 +11:00
parent 2c4beb962b
commit d3a23f42c3
522 changed files with 8501 additions and 6477 deletions

View File

@@ -1,7 +1,7 @@
--- a/net/minecraft/world/entity/raid/EntityRaider.java
+++ b/net/minecraft/world/entity/raid/EntityRaider.java
@@ -38,6 +38,10 @@
import net.minecraft.world.level.WorldAccess;
@@ -41,6 +41,10 @@
import net.minecraft.world.level.pathfinder.PathEntity;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
@@ -11,7 +11,7 @@
public abstract class EntityRaider extends EntityMonsterPatrolling {
protected static final DataWatcherObject<Boolean> IS_CELEBRATING = DataWatcher.defineId(EntityRaider.class, DataWatcherRegistry.BOOLEAN);
@@ -233,7 +237,7 @@
@@ -236,7 +240,7 @@
this.onItemPickup(entityitem);
this.setItemSlot(enumitemslot, itemstack);
this.take(entityitem, itemstack.getCount());
@@ -20,16 +20,16 @@
this.getCurrentRaid().setLeader(this.getWave(), this);
this.setPatrolLeader(true);
} else {
@@ -282,7 +286,7 @@
@@ -290,7 +294,7 @@
@Nullable
private EntityItem pursuedBannerItemEntity;
private final T mob;
- public b(final EntityRaider entityraider, final EntityRaider entityraider1) {
+ public b(final EntityRaider entityraider, final T entityraider1) { // CraftBukkit - decompile error
this.mob = entityraider1;
- public b(final EntityRaider entityraider) {
+ public b(final T entityraider) { // CraftBukkit - decompile error
this.mob = entityraider;
this.setFlags(EnumSet.of(PathfinderGoal.Type.MOVE));
}
@@ -475,7 +479,7 @@
@@ -524,7 +528,7 @@
private final float hostileRadiusSqr;
public final PathfinderTargetCondition shoutTargeting = PathfinderTargetCondition.forNonCombat().range(8.0D).ignoreLineOfSight().ignoreInvisibilityTesting();
@@ -38,7 +38,7 @@
this.mob = entityillagerabstract;
this.hostileRadiusSqr = f * f;
this.setFlags(EnumSet.of(PathfinderGoal.Type.MOVE, PathfinderGoal.Type.LOOK));
@@ -498,7 +502,7 @@
@@ -547,7 +551,7 @@
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();
@@ -47,7 +47,7 @@
}
}
@@ -515,7 +519,7 @@
@@ -564,7 +568,7 @@
while (iterator.hasNext()) {
EntityRaider entityraider = (EntityRaider) iterator.next();