1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
--- a/net/minecraft/server/level/DistanceManager.java
+++ b/net/minecraft/server/level/DistanceManager.java
@@ -114,8 +122,25 @@
}
if (!this.chunksToUpdateFutures.isEmpty()) {
- this.chunksToUpdateFutures.forEach(chunkHolder -> chunkHolder.updateFutures(chunkManager, this.mainThreadExecutor));
- this.chunksToUpdateFutures.clear();
+ // CraftBukkit start
+ // Iterate pending chunk updates with protection against concurrent modification exceptions
+ java.util.Iterator<ChunkHolder> iter = this.chunksToUpdateFutures.iterator();
+ int expectedSize = this.chunksToUpdateFutures.size();
+ do {
+ ChunkHolder playerchunk = iter.next();
+ iter.remove();
+ expectedSize--;
+
+ playerchunk.updateFutures(chunkManager, this.mainThreadExecutor);
+
+ // Reset iterator if set was modified using add()
+ if (this.chunksToUpdateFutures.size() != expectedSize) {
+ expectedSize = this.chunksToUpdateFutures.size();
+ iter = this.chunksToUpdateFutures.iterator();
+ }
+ } while (iter.hasNext());
+ // CraftBukkit end
+
return true;
} else {
if (!this.ticketsToRelease.isEmpty()) {
@@ -146,26 +176,33 @@
}
}
- void addTicket(long chunkPos, Ticket<?> ticket) {
- SortedArraySet<Ticket<?>> tickets = this.getTickets(chunkPos);
- int ticketLevelAt = getTicketLevelAt(tickets);
- Ticket<?> ticket1 = tickets.addOrGet(ticket);
+ boolean addTicket(long i, Ticket<?> ticket) { // CraftBukkit - void -> boolean
+ SortedArraySet<Ticket<?>> arraysetsorted = this.getTickets(i);
+ int j = getTicketLevelAt(arraysetsorted);
+ Ticket<?> ticket1 = (Ticket) arraysetsorted.addOrGet(ticket);
+
ticket1.setCreatedTick(this.ticketTickCounter);
if (ticket.getTicketLevel() < ticketLevelAt) {
this.ticketTracker.update(chunkPos, ticket.getTicketLevel(), true);
}
+
+ return ticket == ticket1; // CraftBukkit
}
- void removeTicket(long chunkPos, Ticket<?> ticket) {
- SortedArraySet<Ticket<?>> tickets = this.getTickets(chunkPos);
- if (tickets.remove(ticket)) {
+ boolean removeTicket(long i, Ticket<?> ticket) { // CraftBukkit - void -> boolean
+ SortedArraySet<Ticket<?>> arraysetsorted = this.getTickets(i);
+
+ boolean removed = false; // CraftBukkit
+ if (arraysetsorted.remove(ticket)) {
+ removed = true; // CraftBukkit
}
if (tickets.isEmpty()) {
this.tickets.remove(chunkPos);
}
- this.ticketTracker.update(chunkPos, getTicketLevelAt(tickets), false);
+ this.ticketTracker.update(i, getTicketLevelAt(arraysetsorted), false);
+ return removed; // CraftBukkit
}
public <T> void addTicket(TicketType<T> type, ChunkPos pos, int level, T value) {
@@ -178,19 +216,35 @@
}
public <T> void addRegionTicket(TicketType<T> type, ChunkPos pos, int distance, T value) {
- Ticket<T> ticket = new Ticket<>(type, ChunkLevel.byStatus(FullChunkStatus.FULL) - distance, value);
- long l = pos.toLong();
- this.addTicket(l, ticket);
- this.tickingTicketsTracker.addTicket(l, ticket);
+ // CraftBukkit start
+ addRegionTicketAtDistance(type, pos, distance, value);
}
+ public <T> boolean addRegionTicketAtDistance(TicketType<T> tickettype, ChunkPos chunkcoordintpair, int i, T t0) {
+ // CraftBukkit end
+ Ticket<T> ticket = new Ticket<>(tickettype, ChunkLevel.byStatus(FullChunkStatus.FULL) - i, t0);
+ long j = chunkcoordintpair.toLong();
+
+ boolean added = this.addTicket(j, ticket); // CraftBukkit
+ this.tickingTicketsTracker.addTicket(j, ticket);
+ return added; // CraftBukkit
+ }
+
public <T> void removeRegionTicket(TicketType<T> type, ChunkPos pos, int distance, T value) {
- Ticket<T> ticket = new Ticket<>(type, ChunkLevel.byStatus(FullChunkStatus.FULL) - distance, value);
- long l = pos.toLong();
- this.removeTicket(l, ticket);
- this.tickingTicketsTracker.removeTicket(l, ticket);
+ // CraftBukkit start
+ removeRegionTicketAtDistance(type, pos, distance, value);
}
+ public <T> boolean removeRegionTicketAtDistance(TicketType<T> tickettype, ChunkPos chunkcoordintpair, int i, T t0) {
+ // CraftBukkit end
+ Ticket<T> ticket = new Ticket<>(tickettype, ChunkLevel.byStatus(FullChunkStatus.FULL) - i, t0);
+ long j = chunkcoordintpair.toLong();
+
+ boolean removed = this.removeTicket(j, ticket); // CraftBukkit
+ this.tickingTicketsTracker.removeTicket(j, ticket);
+ return removed; // CraftBukkit
+ }
+
private SortedArraySet<Ticket<?>> getTickets(long chunkPos) {
return this.tickets.computeIfAbsent(chunkPos, l -> SortedArraySet.create(4));
}
@@ -217,15 +278,17 @@
}
public void removePlayer(SectionPos sectionPos, ServerPlayer player) {
- ChunkPos chunkPos = sectionPos.chunk();
- long l = chunkPos.toLong();
- ObjectSet<ServerPlayer> set = this.playersPerChunk.get(l);
- set.remove(player);
- if (set.isEmpty()) {
- this.playersPerChunk.remove(l);
- this.naturalSpawnChunkCounter.update(l, Integer.MAX_VALUE, false);
- this.playerTicketManager.update(l, Integer.MAX_VALUE, false);
- this.tickingTicketsTracker.removeTicket(TicketType.PLAYER, chunkPos, this.getPlayerTicketLevel(), chunkPos);
+ ChunkPos chunkcoordintpair = sectionPos.chunk();
+ long i = chunkcoordintpair.toLong();
+ ObjectSet<ServerPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
+ if (objectset == null) return; // CraftBukkit - SPIGOT-6208
+
+ objectset.remove(player);
+ if (objectset.isEmpty()) {
+ this.playersPerChunk.remove(i);
+ this.naturalSpawnChunkCounter.update(i, Integer.MAX_VALUE, false);
+ this.playerTicketManager.update(i, Integer.MAX_VALUE, false);
+ this.tickingTicketsTracker.removeTicket(TicketType.PLAYER, chunkcoordintpair, this.getPlayerTicketLevel(), chunkcoordintpair);
}
}
@@ -324,7 +411,28 @@
return !this.tickets.isEmpty();
}
- class ChunkTicketTracker extends ChunkTracker {
+ // CraftBukkit start
+ public <T> void removeAllTicketsFor(TicketType<T> ticketType, int ticketLevel, T ticketIdentifier) {
+ Ticket<T> target = new Ticket<>(ticketType, ticketLevel, ticketIdentifier);
+
+ for (java.util.Iterator<Entry<SortedArraySet<Ticket<?>>>> iterator = this.tickets.long2ObjectEntrySet().fastIterator(); iterator.hasNext();) {
+ Entry<SortedArraySet<Ticket<?>>> entry = iterator.next();
+ SortedArraySet<Ticket<?>> tickets = entry.getValue();
+ if (tickets.remove(target)) {
+ // copied from removeTicket
+ this.ticketTracker.update(entry.getLongKey(), getTicketLevelAt(tickets), false);
+
+ // can't use entry after it's removed
+ if (tickets.isEmpty()) {
+ iterator.remove();
+ }
+ }
+ }
+ }
+ // CraftBukkit end
+
+ private class ChunkTicketTracker extends ChunkTracker {
+
private static final int MAX_LEVEL = ChunkLevel.MAX_LEVEL + 1;
public ChunkTicketTracker() {
|
