From 1b25285462f99790e0426cc4ecdcf0af06a64575 Mon Sep 17 00:00:00 2001 From: covers1624 Date: Sat, 9 Jul 2022 18:52:29 +0930 Subject: [PATCH] Backport: ForgeChunkManager ticking ticket fixes. (#8784) --- .../server/level/DistanceManager.java.patch | 31 +++++++++++++++++-- .../server/level/ServerChunkCache.java.patch | 25 ++++++++++++--- .../common/world/ForgeChunkManager.java | 11 ++----- src/main/resources/forge.exc | 4 +++ 4 files changed, 55 insertions(+), 16 deletions(-) diff --git a/patches/minecraft/net/minecraft/server/level/DistanceManager.java.patch b/patches/minecraft/net/minecraft/server/level/DistanceManager.java.patch index f46c0f1d6d..62d5ca4e2b 100644 --- a/patches/minecraft/net/minecraft/server/level/DistanceManager.java.patch +++ b/patches/minecraft/net/minecraft/server/level/DistanceManager.java.patch @@ -34,16 +34,41 @@ } public void m_140792_(TicketType p_140793_, ChunkPos p_140794_, int p_140795_, T p_140796_) { -@@ -201,6 +_,14 @@ +@@ -188,19 +_,37 @@ + } + + public void m_140840_(TicketType p_140841_, ChunkPos p_140842_, int p_140843_, T p_140844_) { +- Ticket ticket = new Ticket<>(p_140841_, 33 - p_140843_, p_140844_); ++ addRegionTicket(p_140841_, p_140842_, p_140843_, p_140844_, false); ++ } ++ ++ public void addRegionTicket(TicketType p_140841_, ChunkPos p_140842_, int p_140843_, T p_140844_, boolean forceTicks) { ++ Ticket 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 void m_140849_(TicketType p_140850_, ChunkPos p_140851_, int p_140852_, T p_140853_) { +- Ticket ticket = new Ticket<>(p_140850_, 33 - p_140852_, p_140853_); ++ removeRegionTicket(p_140850_, p_140851_, p_140852_, p_140853_, false); ++ } ++ ++ public void removeRegionTicket(TicketType p_140850_, ChunkPos p_140851_, int p_140852_, T p_140853_, boolean forceTicks) { ++ Ticket 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 void registerTicking(TicketType 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 void releaseTicking(TicketType 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> m_140857_(long p_140858_) { diff --git a/patches/minecraft/net/minecraft/server/level/ServerChunkCache.java.patch b/patches/minecraft/net/minecraft/server/level/ServerChunkCache.java.patch index 0132ede911..6746165068 100644 --- a/patches/minecraft/net/minecraft/server/level/ServerChunkCache.java.patch +++ b/patches/minecraft/net/minecraft/server/level/ServerChunkCache.java.patch @@ -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 void m_8387_(TicketType 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 void addRegionTicket(TicketType 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 void m_8438_(TicketType 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 void removeRegionTicket(TicketType 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 void registerTickingTicket(TicketType 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 void releaseTickingTicket(TicketType 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_) { diff --git a/src/main/java/net/minecraftforge/common/world/ForgeChunkManager.java b/src/main/java/net/minecraftforge/common/world/ForgeChunkManager.java index 8f57f600a7..fa21a1f5cf 100644 --- a/src/main/java/net/minecraftforge/common/world/ForgeChunkManager.java +++ b/src/main/java/net/minecraftforge/common/world/ForgeChunkManager.java @@ -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); } /** diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index 817f827c38..ffed1d787c 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -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.(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