Compare commits

...

3 Commits

Author SHA1 Message Date
Spottedleaf
92efc63ec3 Fix missing chunk shift on Z coordinate in last commit 2025-01-25 12:46:33 -08:00
Spottedleaf
41eab7ad00 Update Paper 2025-01-25 11:37:24 -08:00
Spottedleaf
75f1605833 Schedule POTENTIAL_JOB_SITE to correct region
The position may not be owned by the current region so we must
schedule the release to the correct region.

Fixes https://github.com/PaperMC/Folia/issues/319
2025-01-25 11:32:13 -08:00
3 changed files with 23 additions and 6 deletions

View File

@ -0,0 +1,17 @@
--- a/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java
+++ b/net/minecraft/world/entity/ai/behavior/GoToPotentialJobSite.java
@@ -46,12 +_,14 @@
BlockPos blockPos = globalPos.pos();
ServerLevel level1 = level.getServer().getLevel(globalPos.dimension());
if (level1 != null) {
+ io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueTickTaskQueue(level1, blockPos.getX() >> 4, blockPos.getZ() >> 4, () -> { // Folia - region threading
PoiManager poiManager = level1.getPoiManager();
if (poiManager.exists(blockPos, holder -> true)) {
poiManager.release(blockPos);
}
DebugPackets.sendPoiTicketCountPacket(level, blockPos);
+ }); // Folia - region threading
}
});
entity.getBrain().eraseMemory(MemoryModuleType.POTENTIAL_JOB_SITE);

View File

@ -18,7 +18,7 @@
final ServerGamePacketListenerImpl connection = this.getHandle().connection;
if (connection != null) {
connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message, cause);
@@ -1404,6 +_,11 @@
@@ -1405,6 +_,11 @@
@Override
public boolean teleport(Location location, org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause, io.papermc.paper.entity.TeleportFlag... flags) {
@ -30,7 +30,7 @@
Set<io.papermc.paper.entity.TeleportFlag.Relative> relativeArguments;
Set<io.papermc.paper.entity.TeleportFlag> allFlags;
if (flags.length == 0) {
@@ -2068,7 +_,7 @@
@@ -2069,7 +_,7 @@
private void unregisterEntity(Entity other) {
// Paper end
ChunkMap tracker = ((ServerLevel) this.getHandle().level()).getChunkSource().chunkMap;
@ -39,7 +39,7 @@
if (entry != null) {
entry.removePlayer(this.getHandle());
}
@@ -2165,7 +_,7 @@
@@ -2166,7 +_,7 @@
if (original != null) otherPlayer.setUUID(original); // Paper - uuid override
}
@ -48,7 +48,7 @@
if (entry != null && !entry.seenBy.contains(this.getHandle().connection)) {
entry.updatePlayer(this.getHandle());
}
@@ -2314,9 +_,16 @@
@@ -2315,9 +_,16 @@
return this;
}
@ -66,7 +66,7 @@
}
public void setHandle(final ServerPlayer entity) {
@@ -3348,7 +_,7 @@
@@ -3349,7 +_,7 @@
{
if ( CraftPlayer.this.getHealth() <= 0 && CraftPlayer.this.isOnline() )
{

View File

@ -2,7 +2,7 @@ group=dev.folia
version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4
paperRef=88bbead13b07914c01866e35df16b72110fa501e
paperRef=336ea9dfeb23d9eae0711db974a3465dfe72746f
org.gradle.configuration-cache=true
org.gradle.caching=true