Update to Minecraft 1.20.5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-04-24 01:15:00 +10:00
parent 4deda9501f
commit 65bc2541a3
524 changed files with 7788 additions and 6181 deletions

View File

@@ -1,15 +1,6 @@
--- a/net/minecraft/server/level/ChunkMapDistance.java
+++ b/net/minecraft/server/level/ChunkMapDistance.java
@@ -55,7 +55,7 @@
final LongSet ticketsToRelease = new LongOpenHashSet();
final Executor mainThreadExecutor;
private long ticketTickCounter;
- private int simulationDistance = 10;
+ public int simulationDistance = 10;
protected ChunkMapDistance(Executor executor, Executor executor1) {
Objects.requireNonNull(executor1);
@@ -122,10 +122,25 @@
@@ -121,10 +121,25 @@
}
if (!this.chunksToUpdateFutures.isEmpty()) {
@@ -38,7 +29,7 @@
return true;
} else {
if (!this.ticketsToRelease.isEmpty()) {
@@ -161,7 +176,7 @@
@@ -160,7 +175,7 @@
}
}
@@ -47,7 +38,7 @@
ArraySetSorted<Ticket<?>> arraysetsorted = this.getTickets(i);
int j = getTicketLevelAt(arraysetsorted);
Ticket<?> ticket1 = (Ticket) arraysetsorted.addOrGet(ticket);
@@ -171,13 +186,15 @@
@@ -170,13 +185,15 @@
this.ticketTracker.update(i, ticket.getTicketLevel(), true);
}
@@ -65,7 +56,7 @@
}
if (arraysetsorted.isEmpty()) {
@@ -185,6 +202,7 @@
@@ -184,6 +201,7 @@
}
this.ticketTracker.update(i, getTicketLevelAt(arraysetsorted), false);
@@ -73,7 +64,7 @@
}
public <T> void addTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
@@ -198,19 +216,33 @@
@@ -197,19 +215,33 @@
}
public <T> void addRegionTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
@@ -109,7 +100,7 @@
}
private ArraySetSorted<Ticket<?>> getTickets(long i) {
@@ -249,6 +281,7 @@
@@ -248,6 +280,7 @@
ChunkCoordIntPair chunkcoordintpair = sectionposition.chunk();
long i = chunkcoordintpair.toLong();
ObjectSet<EntityPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
@@ -117,7 +108,7 @@
objectset.remove(entityplayer);
if (objectset.isEmpty()) {
@@ -378,6 +411,26 @@
@@ -377,6 +410,26 @@
return !this.tickets.isEmpty();
}