zhangyuheng/DeerFolia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Revert "update upstream folia"

Browse Source 
This reverts commit 85d30a2afb.
This commit is contained in:
zhangyuheng 2024-07-05 11:22:09 +08:00
parent d94af910b3
commit 710b59cfc0
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deer-folia-api

@ -1 +0,0 @@
Subproject commit 3f921793e0649d8c75a43189300d67d849be858a

1
deer-folia-server

@ -1 +0,0 @@
Subproject commit a89fe883f7fc37433c98f1a161097c432e299059

2
gradle.properties
View File

@ -2,7 +2,7 @@ group = cn.lunadeer
version = 1.20.6-R0.1-SNAPSHOT version = 1.20.6-R0.1-SNAPSHOT
mcVersion = 1.20.6 mcVersion = 1.20.6
foliaRef = d79708296e75ee4f26e78c2925f6e7d4217d0575 foliaRef = 36e5e836e8b72e39462545709fc656e69bfb53cf
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=true org.gradle.parallel=true

1
paper-api-generator/generated

@ -1 +0,0 @@
Subproject commit b296ce8d626dab34b4e4d230870edcdd0ef246d0

4
patches/server/0001-Rebranding.patch
View File

@ -132,10 +132,10 @@ index 4f3cc14d48690bb183d09bb7a5ba1e23e8a0c08a..c5d137a9ec9ef3f85bae5cad5d604350
stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now())); stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now()));
stringbuilder.append("\n"); stringbuilder.append("\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 355c8408da189a4805e206db0932c41f940930f0..5c5e3efd7ea0a8a3974617bb8c6f47846b15c233 100644 index 4c9c227c1395744128f347e9303f8a13667a4aa3..232d1bf860353250d91b9870f6a9b5442e36b32e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1025,7 +1025,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1028,7 +1028,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
shutdownThread = Thread.currentThread(); shutdownThread = Thread.currentThread();
org.spigotmc.WatchdogThread.doStop(); // Paper org.spigotmc.WatchdogThread.doStop(); // Paper
if (false && !isSameThread()) { // Folia - region threading if (false && !isSameThread()) { // Folia - region threading

10
patches/server/0003-Sand-duplication.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Sand duplication
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fad6a7185e8e9ea160b47ec9da56d08af9df8396..f5dc632e6a10d6f80d86f360fa18291aede757b9 100644 index d8be7c8dca41b6ad6d9a28590be9e33ef9045bdb..4045e773607227d5bf2b20072d2fea3d520548cb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4117,6 +4117,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -4112,6 +4112,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
protected boolean tryEndPortal() { protected boolean tryEndPortal() {
io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot portal entity async"); io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot portal entity async");
@ -16,7 +16,7 @@ index fad6a7185e8e9ea160b47ec9da56d08af9df8396..f5dc632e6a10d6f80d86f360fa18291a
BlockPos pos = this.portalBlock; BlockPos pos = this.portalBlock;
ServerLevel world = this.portalWorld; ServerLevel world = this.portalWorld;
this.portalBlock = null; this.portalBlock = null;
@@ -4202,12 +4203,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -4197,12 +4198,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
targetPos, 16, // load 16 blocks to be safe from block physics targetPos, 16, // load 16 blocks to be safe from block physics
ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH, ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH,
(chunks) -> { (chunks) -> {
@ -36,7 +36,7 @@ index fad6a7185e8e9ea160b47ec9da56d08af9df8396..f5dc632e6a10d6f80d86f360fa18291a
); );
} }
); );
@@ -4395,6 +4401,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -4390,6 +4396,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return false; return false;
} }
@ -49,7 +49,7 @@ index fad6a7185e8e9ea160b47ec9da56d08af9df8396..f5dc632e6a10d6f80d86f360fa18291a
Vec3 initialPosition = this.position(); Vec3 initialPosition = this.position();
ChunkPos initialPositionChunk = new ChunkPos( ChunkPos initialPositionChunk = new ChunkPos(
io.papermc.paper.util.CoordinateUtils.getChunkX(initialPosition), io.papermc.paper.util.CoordinateUtils.getChunkX(initialPosition),
@@ -4452,7 +4464,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -4447,7 +4459,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
// place // place
passengerTree.root.placeInAsync( passengerTree.root.placeInAsync(
originWorld, destination, Entity.TELEPORT_FLAG_LOAD_CHUNK | (takePassengers ? Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS : 0L), originWorld, destination, Entity.TELEPORT_FLAG_LOAD_CHUNK | (takePassengers ? Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS : 0L),