Update upstream(folia)
This commit is contained in:
@@ -2,7 +2,7 @@ group = me.earthme.luminol
|
|||||||
version=1.21.5-R0.1-SNAPSHOT
|
version=1.21.5-R0.1-SNAPSHOT
|
||||||
mcVersion=1.21.5
|
mcVersion=1.21.5
|
||||||
|
|
||||||
foliaRef=c299a7e8e7f12ff02f3cba19fd4797be0792caa8
|
foliaRef=06ace91ba91c18451404516eced1a9c05f4e3f69
|
||||||
|
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
|
|||||||
@@ -1,25 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: MrHua269 <mrhua269@gmail.com>
|
|
||||||
Date: Sun, 25 May 2025 23:01:35 +0800
|
|
||||||
Subject: [PATCH] Fix forgotten chunk pos shift
|
|
||||||
|
|
||||||
Fixes: https://github.com/PaperMC/Folia/issues/364
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
|
||||||
index 7782dae9f9155eaef35bca2dd2b0782ed6f5c9a3..d3b922a5293efda76db8f42c281b782af764cb04 100644
|
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
|
||||||
@@ -2350,11 +2350,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
|
||||||
Optional<Holder<PoiType>> optional1 = PoiTypes.forState(newState);
|
|
||||||
if (!Objects.equals(optional, optional1)) {
|
|
||||||
BlockPos blockPos = pos.immutable();
|
|
||||||
- optional.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX(), blockPos.getZ(), () -> { // Folia - region threading
|
|
||||||
+ optional.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX() >> 4, blockPos.getZ() >> 4, () -> { // Folia - region threading // Luminol - Fix forgotten chunk pos shift
|
|
||||||
this.getPoiManager().remove(blockPos);
|
|
||||||
DebugPackets.sendPoiRemovedPacket(this, blockPos);
|
|
||||||
}));
|
|
||||||
- optional1.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX(), blockPos.getZ(), () -> { // Folia - region threading
|
|
||||||
+ optional1.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX() >> 4, blockPos.getZ() >> 4, () -> { // Folia - region threading // Luminol - Fix forgotten chunk pos shift
|
|
||||||
// Paper start - Remove stale POIs
|
|
||||||
if (optional.isEmpty() && this.getPoiManager().exists(blockPos, ignored -> true)) {
|
|
||||||
this.getPoiManager().remove(blockPos);
|
|
||||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Portal Behavior Modifiers
|
|||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
|
||||||
index d3b922a5293efda76db8f42c281b782af764cb04..ff4e994bf515f48adc95fe29c4be652a2c438594 100644
|
index 8329bc0cf531a1317ff8e213e948019d28df1eea..84a6bf575902676fc06211562b57806415528e64 100644
|
||||||
--- a/net/minecraft/server/level/ServerLevel.java
|
--- a/net/minecraft/server/level/ServerLevel.java
|
||||||
+++ b/net/minecraft/server/level/ServerLevel.java
|
+++ b/net/minecraft/server/level/ServerLevel.java
|
||||||
@@ -1356,7 +1356,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
@@ -1356,7 +1356,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
|
||||||
Reference in New Issue
Block a user