Skip to content

Commit 78af68b

Browse files
committed
fix some ticket related decompile errors
1 parent 92abbc6 commit 78af68b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build-data/paper.at

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,12 @@ public net.minecraft.server.level.ChunkMap setServerViewDistance(I)V
7575
public net.minecraft.server.level.ChunkMap toDrop
7676
public net.minecraft.server.level.ChunkMap updatingChunkMap
7777
public net.minecraft.server.level.ChunkMap visibleChunkMap
78+
public net.minecraft.server.level.ChunkMap$DistanceManager
7879
public net.minecraft.server.level.ChunkMap$TrackedEntity
7980
public net.minecraft.server.level.ChunkMap$TrackedEntity seenBy
8081
public net.minecraft.server.level.ChunkMap$TrackedEntity serverEntity
81-
public net.minecraft.server.level.ChunkMap.DistanceManager
8282
public net.minecraft.server.level.DistanceManager simulationDistance
8383
public net.minecraft.server.level.DistanceManager ticketStorage
84-
public net.minecraft.server.level.DistanceManager tickets
8584
public net.minecraft.server.level.ServerBossEvent broadcast(Ljava/util/function/Function;)V
8685
public net.minecraft.server.level.ServerBossEvent visible
8786
public net.minecraft.server.level.ServerChunkCache mainThread
@@ -583,6 +582,7 @@ public net.minecraft.world.level.Level thread
583582
public net.minecraft.world.level.Level thunderLevel
584583
public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
585584
public net.minecraft.world.level.StructureManager level
585+
public net.minecraft.world.level.TicketStorage tickets
586586
public net.minecraft.world.level.biome.Biome climateSettings
587587
public net.minecraft.world.level.biome.Biome getTemperature(Lnet/minecraft/core/BlockPos;I)F
588588
public net.minecraft.world.level.biome.Biome$ClimateSettings

paper-server/patches/sources/io/papermc/paper/FeatureHooks.java.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@
139139
+ public static java.util.Collection<org.bukkit.plugin.Plugin> getPluginChunkTickets(net.minecraft.server.level.ServerLevel world,
140140
+ int x, int z) {
141141
+ net.minecraft.server.level.DistanceManager chunkDistanceManager = world.getChunkSource().chunkMap.distanceManager;
142-
+ net.minecraft.util.SortedArraySet<net.minecraft.server.level.Ticket<?>> tickets = chunkDistanceManager.tickets.get(ChunkPos.asLong(x, z));
142+
+ List<net.minecraft.server.level.Ticket> tickets = chunkDistanceManager.ticketStorage.tickets.get(ChunkPos.asLong(x, z));
143143
+
144144
+ if (tickets == null) {
145145
+ return java.util.Collections.emptyList();
146146
+ }
147147
+
148148
+ com.google.common.collect.ImmutableList.Builder<org.bukkit.plugin.Plugin> ret = com.google.common.collect.ImmutableList.builder();
149-
+ for (net.minecraft.server.level.Ticket<?> ticket : tickets) {
149+
+ for (net.minecraft.server.level.Ticket ticket : tickets) {
150150
+ if (ticket.getType() == net.minecraft.server.level.TicketType.PLUGIN_TICKET) {
151151
+ ret.add((org.bukkit.plugin.Plugin) ticket.key);
152152
+ }
@@ -159,12 +159,12 @@
159159
+ Map<org.bukkit.plugin.Plugin, com.google.common.collect.ImmutableList.Builder<Chunk>> ret = new HashMap<>();
160160
+ net.minecraft.server.level.DistanceManager chunkDistanceManager = world.getChunkSource().chunkMap.distanceManager;
161161
+
162-
+ for (it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry<net.minecraft.util.SortedArraySet<net.minecraft.server.level.Ticket<?>>> chunkTickets : chunkDistanceManager.tickets.long2ObjectEntrySet()) {
162+
+ for (it.unimi.dsi.fastutil.longs.Long2ObjectMap.Entry<List<net.minecraft.server.level.Ticket>> chunkTickets : chunkDistanceManager.ticketStorage.tickets.long2ObjectEntrySet()) {
163163
+ long chunkKey = chunkTickets.getLongKey();
164-
+ net.minecraft.util.SortedArraySet<net.minecraft.server.level.Ticket<?>> tickets = chunkTickets.getValue();
164+
+ List<net.minecraft.server.level.Ticket> tickets = chunkTickets.getValue();
165165
+
166166
+ org.bukkit.Chunk chunk = null;
167-
+ for (net.minecraft.server.level.Ticket<?> ticket : tickets) {
167+
+ for (net.minecraft.server.level.Ticket ticket : tickets) {
168168
+ if (ticket.getType() != net.minecraft.server.level.TicketType.PLUGIN_TICKET) {
169169
+ continue;
170170
+ }

0 commit comments

Comments
 (0)