SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and update patches to align with new feature structure.
Some checks failed
SteamWarCI Build failed
Details

Browse Source
This commit is contained in:
Chaoscaot
2025-04-23 19:58:03 +02:00
parent 0eb6b0403e
commit 956a7cc263
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/patches/features/0032-SW-Remove-Worldlock-and-Symlink-Check.patch → paper-server/patches/features/0030-SW-Remove-Worldlock-and-Symlink-Check.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] SW Remove Worldlock and Symlink Check
diff --git a/net/minecraft/world/level/storage/LevelStorageSource.java b/net/minecraft/world/level/storage/LevelStorageSource.java
index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e532ff1b6 100644
index 8104f71c30c1fa46c83acdf0b2e58483df9d89cc..fe0a8254a362618f189c6db8bf86354cace4d310 100644
--- a/net/minecraft/world/level/storage/LevelStorageSource.java
+++ b/net/minecraft/world/level/storage/LevelStorageSource.java
@@ -343,7 +343,7 @@ public class LevelStorageSource {
@@ -344,7 +344,7 @@ public class LevelStorageSource {
public LevelStorageSource.LevelStorageAccess validateAndCreateAccess(String saveName, ResourceKey<LevelStem> dimensionType) throws IOException, ContentValidationException { // CraftBukkit
Path levelPath = this.getLevelPath(saveName);
@ -17,7 +17,7 @@ index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e
if (!list.isEmpty()) {
throw new ContentValidationException(levelPath, list);
} else {
@@ -420,7 +420,6 @@ public class LevelStorageSource {
@@ -421,7 +421,6 @@ public class LevelStorageSource {
}
public class LevelStorageAccess implements AutoCloseable {
@ -25,7 +25,7 @@ index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e
public final LevelStorageSource.LevelDirectory levelDirectory;
private final String levelId;
private final Map<LevelResource, Path> resources = Maps.newHashMap();
@@ -432,7 +431,6 @@ public class LevelStorageSource {
@@ -433,7 +432,6 @@ public class LevelStorageSource {
// CraftBukkit end
this.levelId = levelId;
this.levelDirectory = new LevelStorageSource.LevelDirectory(levelDir);
@ -33,7 +33,7 @@ index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e
}
public long estimateDiskSpace() {
@@ -476,9 +474,7 @@ public class LevelStorageSource {
@@ -477,9 +475,7 @@ public class LevelStorageSource {
}
private void checkLock() {
@ -44,7 +44,7 @@ index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e
}
public PlayerDataStorage createPlayerStorage() {
@@ -532,7 +528,7 @@ public class LevelStorageSource {
@@ -533,7 +529,7 @@ public class LevelStorageSource {
}
public Optional<Path> getIconFile() {
@ -53,7 +53,7 @@ index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e
}
public void deleteLevel() throws IOException {
@@ -561,7 +557,6 @@ public class LevelStorageSource {
@@ -562,7 +558,6 @@ public class LevelStorageSource {
throw exception;
} else {
if (dir.equals(LevelStorageAccess.this.levelDirectory.path())) {
@ -61,7 +61,7 @@ index de43e54698125ce9f319d4889dd49f7029fe95e0..e21d744040bcf58b391f002f2dd1129e
Files.deleteIfExists(path);
}
@@ -645,7 +640,7 @@ public class LevelStorageSource {
@@ -646,7 +641,7 @@ public class LevelStorageSource {
@Override
public void close() throws IOException {

0
paper-server/patches/features/0033-SW-Remove-Debug-Message.patch → paper-server/patches/features/0031-SW-Remove-Debug-Message.patch
View File

6
paper-server/patches/features/0034-SW-Disable-Commands.patch → paper-server/patches/features/0032-SW-Disable-Commands.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] SW Disable Commands
diff --git a/net/minecraft/commands/Commands.java b/net/minecraft/commands/Commands.java
index f8969a68cd352ce4fe5109205e78f5e19ab6e020..efae844a9419b1e06bcd6ed0d2a4d70cb622330f 100644
index 9dd86cf63dd93620adb539a7a80a8d01c7ac08a2..3289d9f441aa219f019b63531b0ab431fcfe9115 100644
--- a/net/minecraft/commands/Commands.java
+++ b/net/minecraft/commands/Commands.java
@@ -155,66 +155,66 @@ public class Commands {
@@ -155,67 +155,67 @@ public class Commands {
}
public Commands(Commands.CommandSelection selection, CommandBuildContext context, final boolean modern) {
// Paper end - Brigadier API - modern minecraft overloads that do not use redirects but are copies instead
@ -109,7 +109,9 @@ index f8969a68cd352ce4fe5109205e78f5e19ab6e020..efae844a9419b1e06bcd6ed0d2a4d70c
+ //TeamMsgCommand.register(this.dispatcher);
TeleportCommand.register(this.dispatcher);
- TellRawCommand.register(this.dispatcher, context);
- TestCommand.register(this.dispatcher, context);
+ //TellRawCommand.register(this.dispatcher, context);
+ //TestCommand.register(this.dispatcher, context);
TickCommand.register(this.dispatcher);
TimeCommand.register(this.dispatcher);
- TitleCommand.register(this.dispatcher, context);