Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Latest updates, 1.18 work

Browse Source
This commit is contained in:
Cryptite
2022-03-17 08:10:56 -05:00
parent 5de00a857b
commit 5a042b7890
8 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0001-Build-changes.patch
View File

@@ -42,10 +42,10 @@ index 4beb35d1e5b013395f5df101e843f41c2ce174ad..cc2e1f98da222117d378a10912464441
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 07c382f30ed3736ed15b5b71f48dc4a1de958242..2e8ec4dce4962420840d04600ec0ce2ae40f585c 100644
index c8d56947305c981a3268ce4ae3e975db350ceff2..ce51ebeb5df07abc4a8bb31bc737ab3e4214ce83 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -55,7 +55,7 @@ index 07c382f30ed3736ed15b5b71f48dc4a1de958242..2e8ec4dce4962420840d04600ec0ce2a
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7343bd96a4a15f4abc081e565175db8df930a470..def3cbb36c3ae5efb1fad8c32cc501840c60dc87 100644
index 55c981f2c8070fc1bd9ecd4f4df140d9d0c68319..d0c577840899f378093c2d9b9aad9e393c93d270 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper