Backport: ForgeChunkManager ticking ticket fixes. (#8784)

This commit is contained in:
covers1624 authored and GitHub committed 2022-07-09 18:52:29 +09:30
1 parent 0f4e3146e0
commit 1b25285462
4 files changed
+55 -16

No files matched your search

@@ -34,16 +34,41 @@
}
public <T> void m_140792_(TicketType<T> p_140793_, ChunkPos p_140794_, int p_140795_, T p_140796_) {
@@ -201,6 +_,14 @@
@@ -188,19 +_,37 @@
}
public <T> void m_140840_(TicketType<T> p_140841_, ChunkPos p_140842_, int p_140843_, T p_140844_) {
- Ticket<T> ticket = new Ticket<>(p_140841_, 33 - p_140843_, p_140844_);
+ addRegionTicket(p_140841_, p_140842_, p_140843_, p_140844_, false);
+ }
+
+ public <T> void addRegionTicket(TicketType<T> p_140841_, ChunkPos p_140842_, int p_140843_, T p_140844_, boolean forceTicks) {
+ Ticket<T> ticket = new Ticket<>(p_140841_, 33 - p_140843_, p_140844_, forceTicks);
long i = p_140842_.m_45588_();
this.m_140784_(i, ticket);
this.f_183901_.m_184151_(i, ticket);
}
public <T> void m_140849_(TicketType<T> p_140850_, ChunkPos p_140851_, int p_140852_, T p_140853_) {
- Ticket<T> ticket = new Ticket<>(p_140850_, 33 - p_140852_, p_140853_);
+ removeRegionTicket(p_140850_, p_140851_, p_140852_, p_140853_, false);
+ }
+
+ public <T> void removeRegionTicket(TicketType<T> p_140850_, ChunkPos p_140851_, int p_140852_, T p_140853_, boolean forceTicks) {
+ Ticket<T> ticket = new Ticket<>(p_140850_, 33 - p_140852_, p_140853_, forceTicks);
long i = p_140851_.m_45588_();
this.m_140818_(i, ticket);
this.f_183901_.m_184165_(i, ticket);
}
+ @Deprecated(forRemoval = true, since = "1.18.2") // Use addRegionTicket overload
+ public <T> void registerTicking(TicketType<T> type, ChunkPos pos, int distance, T value) {
+ this.m_140784_(pos.m_45588_(), new Ticket<>(type, 33 - distance, value, true));
+ addRegionTicket(type, pos, distance, value, true);
+ }
+
+ @Deprecated(forRemoval = true, since = "1.18.2") // Use removeRegionTicket overload
+ public <T> void releaseTicking(TicketType<T> type, ChunkPos pos, int distance, T value) {
+ this.m_140818_(pos.m_45588_(), new Ticket<>(type, 33 - distance, value, true));
+ removeRegionTicket(type, pos, distance, value, true);
+ }
+
private SortedArraySet<Ticket<?>> m_140857_(long p_140858_) {
@@ -17,18 +17,35 @@
levelchunk1.m_187632_(j);
if (flag2 && (this.f_8335_ || this.f_8336_) && this.f_8329_.m_6857_().m_61927_(chunkpos)) {
NaturalSpawner.m_47029_(this.f_8329_, levelchunk1, naturalspawner$spawnstate, this.f_8336_, this.f_8335_, flag1);
@@ -426,6 +_,14 @@
@@ -421,11 +_,29 @@
}
public <T> void m_8387_(TicketType<T> p_8388_, ChunkPos p_8389_, int p_8390_, T p_8391_) {
- this.f_8327_.m_140840_(p_8388_, p_8389_, p_8390_, p_8391_);
+ addRegionTicket(p_8388_, p_8389_, p_8390_, p_8391_, false);
+ }
+
+ public <T> void addRegionTicket(TicketType<T> p_8388_, ChunkPos p_8389_, int p_8390_, T p_8391_, boolean forceTicks) {
+ this.f_8327_.addRegionTicket(p_8388_, p_8389_, p_8390_, p_8391_, forceTicks);
}
public <T> void m_8438_(TicketType<T> p_8439_, ChunkPos p_8440_, int p_8441_, T p_8442_) {
this.f_8327_.m_140849_(p_8439_, p_8440_, p_8441_, p_8442_);
- this.f_8327_.m_140849_(p_8439_, p_8440_, p_8441_, p_8442_);
+ removeRegionTicket(p_8439_, p_8440_, p_8441_, p_8442_, false);
+ }
+
+ public <T> void removeRegionTicket(TicketType<T> p_8439_, ChunkPos p_8440_, int p_8441_, T p_8442_, boolean forceTicks) {
+ this.f_8327_.removeRegionTicket(p_8439_, p_8440_, p_8441_, p_8442_, forceTicks);
+ }
+
+ @Deprecated(forRemoval = true, since = "1.18.2") // Use addRegionTicket overload
+ public <T> void registerTickingTicket(TicketType<T> type, ChunkPos pos, int distance, T value) {
+ this.f_8327_.registerTicking(type, pos, distance, value);
+ addRegionTicket(type, pos, distance, value, true);
+ }
+
+ @Deprecated(forRemoval = true, since = "1.18.2") // Use removeRegionTicket overload
+ public <T> void releaseTickingTicket(TicketType<T> type, ChunkPos pos, int distance, T value) {
+ this.f_8327_.releaseTicking(type, pos, distance, value);
+ removeRegionTicket(type, pos, distance, value, true);
}
public void m_6692_(ChunkPos p_8400_, boolean p_8401_) {
@@ -152,16 +152,9 @@ public class ForgeChunkManager
boolean ticking)
{
if (add)
{
if (ticking)
level.getChunkSource().registerTickingTicket(type, pos, 2, owner);
else
level.getChunkSource().addRegionTicket(type, pos, 2, owner);
}
else if (ticking)
level.getChunkSource().releaseTickingTicket(type, pos, 2, owner);
level.getChunkSource().addRegionTicket(type, pos, 2, owner, ticking);
else
level.getChunkSource().removeRegionTicket(type, pos, 2, owner);
level.getChunkSource().removeRegionTicket(type, pos, 2, owner, ticking);
}
/**
+4
View File
@@ -27,6 +27,10 @@ net/minecraft/gametest/framework/GameTestRegistry.register(Ljava/lang/reflect/Me
net/minecraft/network/FriendlyByteBuf.writeItemStack(Lnet/minecraft/world/item/ItemStack;Z)Lnet/minecraft/network/FriendlyByteBuf;=|p_130056_,limitedTag
net/minecraft/server/ServerAdvancementManager.<init>(Lnet/minecraft/world/level/storage/loot/PredicateManager;Lnet/minecraftforge/common/crafting/conditions/ICondition$IContext;)V=|p_136027_,context
net/minecraft/server/dedicated/DedicatedServer.sendMessage(Lnet/minecraft/network/chat/Component;Ljava/util/UUID;)V=|message,p_108776_
net/minecraft/server/level/DistanceManager.addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V=|p_140841_,p_140842_,p_140843_,p_140844_,forceTicks
net/minecraft/server/level/DistanceManager.removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V=|p_140850_,p_140851_,p_140852_,p_140853_,forceTicks
net/minecraft/server/level/ServerChunkCache.addRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V=|p_8388_,p_8389_,p_8390_,p_8391_,forceTicks
net/minecraft/server/level/ServerChunkCache.removeRegionTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;Z)V=|p_8439_,p_8440_,p_8441_,p_8442_,forceTicks
net/minecraft/server/level/ServerLevel.removeEntity(Lnet/minecraft/world/entity/Entity;Z)V=|p_8868_,keepData
net/minecraft/server/level/ServerLevel.removeEntityComplete(Lnet/minecraft/world/entity/Entity;Z)V=|p_8865_,keepData
net/minecraft/server/level/ServerLevel.removePlayer(Lnet/minecraft/server/level/ServerPlayer;Z)V=|p_8850_,keepData