renaming getTicketManager to de-conflict with other mods

This commit is contained in:
gnembon committed 2020-04-22 01:26:06 -03:00
1 parent f5316a1e2d
commit 24787e8e56
4 files changed
+4 -4

No files matched your search

@@ -4,5 +4,5 @@ import net.minecraft.server.world.ChunkTicketManager;
public interface ServerChunkManagerInterface public interface ServerChunkManagerInterface
{ {
ChunkTicketManager getTicketManager(); ChunkTicketManager getCMTicketManager();
} }
@@ -35,7 +35,7 @@ public abstract class ServerChunkManagerMixin implements ServerChunkManagerInter
@Shadow @Final private ChunkTicketManager ticketManager; @Shadow @Final private ChunkTicketManager ticketManager;
@Override // shared between scarpet and spawnChunks setting @Override // shared between scarpet and spawnChunks setting
public ChunkTicketManager getTicketManager() public ChunkTicketManager getCMTicketManager()
{ {
return ticketManager; return ticketManager;
} }
@@ -713,7 +713,7 @@ public class CarpetExpression
ServerWorld world = ((CarpetContext) c).s.getWorld(); ServerWorld world = ((CarpetContext) c).s.getWorld();
Long2ObjectOpenHashMap<SortedArraySet<ChunkTicket<?>>> levelTickets = ( Long2ObjectOpenHashMap<SortedArraySet<ChunkTicket<?>>> levelTickets = (
(ChunkTicketManagerInterface) ((ServerChunkManagerInterface) world.getChunkManager()) (ChunkTicketManagerInterface) ((ServerChunkManagerInterface) world.getChunkManager())
.getTicketManager() .getCMTicketManager()
).getTicketsByPosition(); ).getTicketsByPosition();
List<Value> res = new ArrayList<>(); List<Value> res = new ArrayList<>();
if (lv.size() == 0) if (lv.size() == 0)
+1 -1
View File
@@ -10,7 +10,7 @@ public class SpawnChunks
{ {
public static void changeSpawnChunks(ServerChunkManager chunkManager, ChunkPos pos, int size) public static void changeSpawnChunks(ServerChunkManager chunkManager, ChunkPos pos, int size)
{ {
ChunkTicketManager ticketManager = ((ServerChunkManagerInterface)chunkManager).getTicketManager(); ChunkTicketManager ticketManager = ((ServerChunkManagerInterface)chunkManager).getCMTicketManager();
((ChunkTicketManagerInterface)ticketManager).changeSpawnChunks(pos, size); ((ChunkTicketManagerInterface)ticketManager).changeSpawnChunks(pos, size);
} }
} }