Merge branch 'master' into 1.16
# Conflicts: # src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java # src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
This commit is contained in:
commit
7ebc96106b
26 files changed
+354
-83
No files matched your search
@@ -1,14 +1,14 @@
|
||||
package carpet.script;
|
||||
|
||||
import carpet.CarpetServer;
|
||||
import carpet.fakes.ChunkTicketManagerInterface;
|
||||
import carpet.fakes.MinecraftServerInterface;
|
||||
import carpet.fakes.BiomeArrayInterface;
|
||||
import carpet.fakes.ServerChunkManagerInterface;
|
||||
import carpet.fakes.StatTypeInterface;
|
||||
import carpet.fakes.ThreadedAnvilChunkStorageInterface;
|
||||
import carpet.helpers.FeatureGenerator;
|
||||
import carpet.mixins.ChunkTicketManager_scarpetMixin;
|
||||
import carpet.mixins.PointOfInterest_scarpetMixin;
|
||||
import carpet.mixins.ServerChunkManager_scarpetMixin;
|
||||
import carpet.script.Fluff.TriFunction;
|
||||
import carpet.script.bundled.Module;
|
||||
import carpet.CarpetSettings;
|
||||
@@ -707,7 +707,7 @@ public class CarpetExpression
|
||||
{
|
||||
ServerWorld world = ((CarpetContext) c).s.getWorld();
|
||||
Long2ObjectOpenHashMap<SortedArraySet<ChunkTicket<?>>> levelTickets = (
|
||||
(ChunkTicketManager_scarpetMixin) ((ServerChunkManager_scarpetMixin) world.getChunkManager())
|
||||
(ChunkTicketManagerInterface) ((ServerChunkManagerInterface) world.getChunkManager())
|
||||
.getTicketManager()
|
||||
).getTicketsByPosition();
|
||||
List<Value> res = new ArrayList<>();
|
||||
|
||||
Reference in new issue
Block a user