Skip to content

Commit dcf362d

Browse files
committed
Update to 26.3-rc-1
1 parent a4fd640 commit dcf362d

5 files changed

Lines changed: 108 additions & 109 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=io.papermc.paper
2-
mcVersion=26.3-pre-3
2+
mcVersion=26.3-rc-1
33
# This is the current API version for use in (paper-)plugin.yml files
44
# During snapshot cycles this should be the anticipated version of the release target
55
apiVersion=26.3

paper-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ plugins {
1414
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
1515

1616
dependencies {
17-
mache("io.papermc:mache:26.3-pre-3+build.1")
17+
mache("io.papermc:mache:26.3-rc-1+build.1")
1818
paperclip("io.papermc:paperclip:3.0.4")
1919
}
2020

paper-server/patches/sources/net/minecraft/server/level/ChunkMap.java.patch

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
}
144144
}, this.unloadQueue::add).whenComplete((ignored, throwable) -> {
145145
if (throwable != null) {
146-
@@ -839,7 +_,7 @@
146+
@@ -842,7 +_,7 @@
147147
}
148148

149149
public int size() {
@@ -152,7 +152,7 @@
152152
}
153153

154154
public net.minecraft.server.level.DistanceManager getDistanceManager() {
155-
@@ -866,10 +_,10 @@
155+
@@ -869,10 +_,10 @@
156156
.addColumn("fluid_ticks")
157157
.build(output);
158158

@@ -167,7 +167,7 @@
167167
Optional<ChunkAccess> chunk = Optional.ofNullable(holder.getLatestChunk());
168168
Optional<LevelChunk> fullChunk = chunk.flatMap(
169169
chunkAccess -> chunkAccess instanceof LevelChunk levelChunk ? Optional.of(levelChunk) : Optional.empty()
170-
@@ -918,14 +_,15 @@
170+
@@ -921,14 +_,15 @@
171171
return this.upgradeChunkTag(
172172
tag,
173173
-1,
@@ -186,7 +186,7 @@
186186
generatorIdentifier.ifPresent(identifier -> contextTag.putString("generator", identifier.toString()));
187187
return contextTag;
188188
}
189-
@@ -937,7 +_,7 @@
189+
@@ -940,7 +_,7 @@
190190
ChunkHolder holder = this.visibleChunkMap.get(spawnCandidateChunks.nextLong());
191191
if (holder != null) {
192192
LevelChunk chunk = holder.getTickingChunk();
@@ -195,7 +195,7 @@
195195
output.add(chunk);
196196
}
197197
}
198-
@@ -957,8 +_,14 @@
198+
@@ -960,8 +_,14 @@
199199
}
200200

201201
public boolean anyPlayerCloseEnoughForSpawning(final ChunkPos pos) {
@@ -211,7 +211,7 @@
211211
}
212212

213213
public boolean anyPlayerCloseEnoughTo(final BlockPos pos, final int maxDistance) {
214-
@@ -974,8 +_,24 @@
214+
@@ -977,8 +_,24 @@
215215
}
216216

217217
private boolean anyPlayerCloseEnoughForSpawningInternal(final ChunkPos pos) {
@@ -237,7 +237,7 @@
237237
return true;
238238
}
239239
}
240-
@@ -992,7 +_,7 @@
240+
@@ -995,7 +_,7 @@
241241
Builder<ServerPlayer> builder = ImmutableList.builder();
242242

243243
for (ServerPlayer player : this.playerMap.getAllPlayers()) {
@@ -246,7 +246,7 @@
246246
builder.add(player);
247247
}
248248
}
249-
@@ -1000,13 +_,13 @@
249+
@@ -1003,13 +_,13 @@
250250
return builder.build();
251251
}
252252

@@ -262,7 +262,7 @@
262262
}
263263

264264
private boolean playerIsCloseEnoughTo(final ServerPlayer player, final Vec3 pos, final int maxDistance) {
265-
@@ -1138,9 +_,19 @@
265+
@@ -1141,9 +_,19 @@
266266
}
267267

268268
protected void addEntity(final Entity entity) {
@@ -282,15 +282,15 @@
282282
if (range != 0) {
283283
if (this.entityMap.containsKey(entity.getId())) {
284284
throw (IllegalStateException)Util.pauseInIde(new IllegalStateException("Entity is already tracked!"));
285-
@@ -1164,6 +_,7 @@
285+
@@ -1167,6 +_,7 @@
286286
}
287287

288288
protected void removeEntity(final Entity entity) {
289289
+ org.spigotmc.AsyncCatcher.catchOp("entity untrack"); // Spigot
290290
if (entity instanceof ServerPlayer player) {
291291
this.updatePlayerStatus(player, false);
292292

293-
@@ -1320,10 +_,10 @@
293+
@@ -1323,10 +_,10 @@
294294
private final Entity entity;
295295
private final int range;
296296
private SectionPos lastSectionPos;
@@ -303,15 +303,15 @@
303303
this.entity = entity;
304304
this.range = range;
305305
this.lastSectionPos = SectionPos.of(entity);
306-
@@ -1370,6 +_,7 @@
306+
@@ -1373,6 +_,7 @@
307307
}
308308

309309
public void removePlayer(final ServerPlayer player) {
310310
+ org.spigotmc.AsyncCatcher.catchOp("player tracker clear"); // Spigot
311311
if (this.seenBy.remove(player.connection)) {
312312
this.serverEntity.removePairing(player);
313313
if (this.seenBy.isEmpty()) {
314-
@@ -1379,23 +_,47 @@
314+
@@ -1382,23 +_,47 @@
315315
}
316316

317317
public void updatePlayer(final ServerPlayer player) {
@@ -362,7 +362,7 @@
362362
}
363363
} else {
364364
this.removePlayer(player);
365-
@@ -1412,6 +_,7 @@
365+
@@ -1415,6 +_,7 @@
366366

367367
for (Entity passenger : this.entity.getIndirectPassengers()) {
368368
int passengerRange = passenger.getType().clientTrackingRange() * 16;

0 commit comments

Comments
 (0)