Skip to content

Update Upstream (Paper) #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dueris merged 1 commit into from
Aug 31, 2026
Merged

Update Upstream (Paper) #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion canvas-server/minecraft-patches/base/0002-Remove-Vanilla-Profiler.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ index e97de026465eaa08df5fa96a2a20a89274dccbb9..0df8e380b7d4254e004949964ce266ff
}

diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index 6016a5e2917dc35fb7a2fa2b2c9e48a7883b03c5..fbbe5928ff6c6cb1719eef14d4123b146c6f1781 100644
index c384c4102bbf794cf8ca225c56aa5553a3b9c269..24321fb6687ef75ffd75b239bc7fbcc11b2c6a7c 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -73,8 +73,6 @@ import net.minecraft.util.Util;
Expand Down
2 changes: 1 addition & 1 deletion canvas-server/minecraft-patches/base/0004-Region-Threading.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20542,7 +20542,7 @@ index cc6f4e2845ef1e95c765d65f17c8aa1b06652927..7316c756f1c228eef710219a659c7968
foundPlayers.add(player);
}
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index fbbe5928ff6c6cb1719eef14d4123b146c6f1781..86c0f0adbc663b2a0a4dafc4385cf3ce88b5b475 100644
index 24321fb6687ef75ffd75b239bc7fbcc11b2c6a7c..00f0604b44b5e152c8605e47ff3082c6eec25df9 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -190,11 +190,11 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ apiVersion = 26.2
mcVersion = 26.2
channel = STABLE

paperRef = bb09b431d24f586da72ee7c4aa2e8cff2b32a478
paperRef = a2a42c5b12249aaba42a347327fd930a1f94af06

org.gradle.configuration-cache = true
org.gradle.caching = true
Expand Down
Loading