From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Mon, 10 Jun 2024 10:51:08 +0000 Subject: [PATCH] Try fixing folia off region POI accessing issue diff --git a/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java b/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..7812a71f05dd32646037afd22cdabf72bb23b0d1 --- /dev/null +++ b/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java @@ -0,0 +1,25 @@ +package me.earthme.luminol.config.modules.fixes; + +import me.earthme.luminol.config.ConfigInfo; +import me.earthme.luminol.config.EnumConfigCategory; +import me.earthme.luminol.config.IConfigModule; + +public class FoliaPOIAccessOffRegionFixConfig implements IConfigModule { + @ConfigInfo(baseName = "enabled", comments = + """ + The POIManager of folia has something which has not been patched\s + for regionized ticking and these would trigger the async catcher\s + and make the server crash.If you would like to prevent it and didn't\s + mind the side effect(currently unknown), you can enable this""") + public static boolean enabled = false; + + @Override + public EnumConfigCategory getCategory() { + return EnumConfigCategory.FIXES; + } + + @Override + public String getBaseName() { + return "folia.fix_poi_access_off_region"; + } +} diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java index aac1df9e2c0652bc6348af0404deba7465f82d42..ad812fd30d21ee3b7727105c66f2fc495a44f6ca 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java @@ -49,10 +49,17 @@ public class GoToPotentialJobSite extends Behavior { ServerLevel serverLevel2 = serverLevel.getServer().getLevel(pos.dimension()); if (serverLevel2 != null) { PoiManager poiManager = serverLevel2.getPoiManager(); + //Luminol start - Fix off region POI accessing + java.lang.Runnable scheduledRelease = () -> { if (poiManager.exists(blockPos, poiType -> true)) { poiManager.release(blockPos); } - + }; + if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(serverLevel2, blockPos) && me.earthme.luminol.config.modules.fixes.FoliaPOIAccessOffRegionFixConfig.enabled) + io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(serverLevel2, blockPos.getX() >> 4, blockPos.getZ() >> 4, scheduledRelease); + else + scheduledRelease.run(); + //Luminol end DebugPackets.sendPoiTicketCountPacket(serverLevel, blockPos); } }); diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/YieldJobSite.java b/src/main/java/net/minecraft/world/entity/ai/behavior/YieldJobSite.java index d1a9b62d3304916275dd6b4c4e783cf1563b5e21..7d90e57b59ca1be1cc64ff6b53c64ea1f1767ad0 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/YieldJobSite.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/YieldJobSite.java @@ -33,7 +33,10 @@ public class YieldJobSite { } else if (entity.getVillagerData().getProfession() != VillagerProfession.NONE) { return false; } else { - BlockPos blockPos = context.get(potentialJobSite).pos(); + final GlobalPos globalPos = context.get(potentialJobSite); //Luminol - Try fixing off main POI accessing + final net.minecraft.server.level.ServerLevel targetLevel = net.minecraft.server.MinecraftServer.getServer().getLevel(globalPos.dimension()); //Luminol - Try fixing off main POI accessing + BlockPos blockPos = globalPos.pos(); //Luminol - Try fixing off main POI accessing + if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(targetLevel, blockPos) && me.earthme.luminol.config.modules.fixes.FoliaPOIAccessOffRegionFixConfig.enabled) return true; //Luminol - Try fixing off main POI accessing Optional> optional = world.getPoiManager().getType(blockPos); if (optional.isEmpty()) { return true; diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java index f3f98e6276dda3bc4f290fc2d80569f7e1e7ef66..edc127c94a54aed42120a5b4cc7036b5ddc8c656 100644 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java @@ -212,7 +212,7 @@ public class PoiManager extends SectionStorage im public Stream getInSquare(Predicate> typePredicate, BlockPos pos, int radius, PoiManager.Occupancy occupationStatus) { int i = Math.floorDiv(radius, 16) + 1; - return ChunkPos.rangeClosed(new ChunkPos(pos), i).flatMap(chunkPos -> this.getInChunk(typePredicate, chunkPos, occupationStatus)).filter(poi -> { + return ChunkPos.rangeClosed(new ChunkPos(pos), i).filter(cpos -> me.earthme.luminol.config.modules.fixes.FoliaPOIAccessOffRegionFixConfig.enabled ? ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.world,cpos) : true).flatMap(chunkPos -> this.getInChunk(typePredicate, chunkPos, occupationStatus)).filter(poi -> { //Luminol - Fix off region POI access BlockPos blockPos2 = poi.getPos(); return Math.abs(blockPos2.getX() - pos.getX()) <= radius && Math.abs(blockPos2.getZ() - pos.getZ()) <= radius; });