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,6 +1,6 @@
--- a/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
+++ b/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
@@ -110,14 +110,14 @@
@@ -111,14 +111,14 @@
this.origin = blockposition;
this.validPlayer = IEntitySelector.ENTITY_STILL_ALIVE.and(IEntitySelector.withinDistance((double) blockposition.getX(), (double) (128 + blockposition.getY()), (double) blockposition.getZ(), 192.0D));
this.needsStateScanning = enderdragonbattle_a.needsStateScanning;
@@ -17,7 +17,7 @@
this.gateways.addAll((Collection) enderdragonbattle_a.gateways.orElseGet(() -> {
ObjectArrayList<Integer> objectarraylist = new ObjectArrayList(ContiguousSet.create(Range.closedOpen(0, 20), DiscreteDomain.integers()));
@@ -207,7 +207,7 @@
@@ -208,7 +208,7 @@
this.dragonKilled = false;
if (!flag) {
EnderDragonBattle.LOGGER.info("But we didn't have a portal, let's remove it.");
@@ -26,7 +26,7 @@
this.dragonUUID = null;
}
}
@@ -510,7 +510,7 @@
@@ -513,7 +513,7 @@
return this.previouslyKilled;
}
@@ -35,7 +35,7 @@
if (this.dragonKilled && this.respawnStage == null) {
BlockPosition blockposition = this.portalLocation;
@@ -537,19 +537,19 @@
@@ -540,19 +540,19 @@
List<EntityEnderCrystal> list1 = this.level.getEntitiesOfClass(EntityEnderCrystal.class, new AxisAlignedBB(blockposition1.relative(enumdirection, 2)));
if (list1.isEmpty()) {
@@ -59,7 +59,7 @@
if (this.dragonKilled && this.respawnStage == null) {
for (ShapeDetector.ShapeDetectorCollection shapedetector_shapedetectorcollection = this.findExitPortal(); shapedetector_shapedetectorcollection != null; shapedetector_shapedetectorcollection = this.findExitPortal()) {
for (int i = 0; i < this.exitPortalPattern.getWidth(); ++i) {
@@ -569,8 +569,9 @@
@@ -572,8 +572,9 @@
this.respawnTime = 0;
this.spawnExitPortal(false);
this.respawnCrystals = list;