Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-23 00:39:20 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9e7f6c3 Fixup and deprecate player profiles in ping event (#10880)
PaperMC/Paper@5914f60 Update AbstractArrow item method implementations for 1.20.6 (#10885)
PaperMC/Paper@3889ffb Fix Player#sendBlockUpdate (#10855)
PaperMC/Paper@af7f0c4 Fix ItemMeta#removeEnchantments (#10886)
PaperMC/Paper@43484eb Add back RecipeIterator fixes patch (#10887)
PaperMC/Paper@fe7043e Configurable damage tick when blocking with shield (#10877)
PaperMC/Paper@122c9d3 Fix NPE in V3808
PaperMC/Paper@e41d44f Fix `hasFiredAsync` parameter when `AsyncPlayerSendCommandsEvent` is called (#10896)
PaperMC/Paper@20f5165 Backport `LivingEntity#canUseEquipmentSlot` API (#11013)
PaperMC/Paper@6e71f41 Updated Upstream (CraftBukkit/Spigot)
This commit is contained in:
Samsuik
2024-09-02 23:14:51 +01:00
parent 9e27f8e0da
commit 26c1ff68ac
7 changed files with 10 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
version=1.20.6-R0.1-SNAPSHOT version=1.20.6-R0.1-SNAPSHOT
mcVersion=1.20.6 mcVersion=1.20.6
paperRef=79e2cb620ef03539390d97940824b38b707918f5 paperRef=6e71f415369e35558450f015cfcc2d2db1c0e064
org.gradle.jvmargs=-Xmx2G org.gradle.jvmargs=-Xmx2G

8
patches/server/0005-Visibility-API-and-Command.patch
View File

@@ -255,7 +255,7 @@ index 1a37654aff9a9c86c9f7af10a1cf721371f0c5ec..82644b34a77dc5e5af38260b7b07b3ec
public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, ShortSet positions, LevelChunkSection section) { public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, ShortSet positions, LevelChunkSection section) {
this.sectionPos = sectionPos; this.sectionPos = sectionPos;
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 9677324fc698789e9cd880705985d6112c6bd9bb..606ae62f597761296412e14750758fa185fc3c48 100644 index aae93a7f1b7c7744e4cd354b6d070d4f2d4d8843..dd5994f65ef31a41d0f4f06f4990078d4c20a450 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
@@ -1799,6 +1799,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1799,6 +1799,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -469,10 +469,10 @@ index 308aef9c4933b2bcdd622a34b68efab4a220fe4d..2aee1167e7c4f47f3fe82d135904beac
throw new ReportedException(crashreport); throw new ReportedException(crashreport);
} }
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 4ae88bfcead40cd05f9514a48a922a37767cb3cf..e675c47bf6630ccb843120902a10b9dc3952f5c7 100644 index dd0610104822bee532542c87ecc9cd16ccf3c216..e513380ae2988d466056fcedc7529b363544337e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3174,6 +3174,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -3172,6 +3172,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
event.setCancelled(cancelled); event.setCancelled(cancelled);
AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224 AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
@@ -533,7 +533,7 @@ index 1059530bb6f817352c8304f6a1544aeb5ac14b30..5a43957309019bec27b9624e5268d6a8
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7e6116963d835d4606ef3d93b69d3e44b61288e1..c0109fd2db0724418d55e68a27c363c8c24ff8c1 100644 index 32c3c2c6b2eaa90b149d9b425341e75b85bd9764..549d4c45d072e95b741ceb79779cd8fac65bf185 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -543,6 +543,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -543,6 +543,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
patches/server/0078-Entity-tracking-range-modifier.patch
View File

@@ -33,10 +33,10 @@ index bed136477493365d62d1b82e8f7802513a394991..a2ab2691c1727ec30c22c0a6e5a6b78d
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) { public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9072827a38fb5dfd736e134c13b7b4b681e57cac..3ddd3fee5d8e2208c6e0afbdf68ca7344772fd8b 100644 index 549d4c45d072e95b741ceb79779cd8fac65bf185..bafd9e135a38d78e7a040c744afe46a3cc96bc52 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2998,6 +2998,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2999,6 +2999,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return (this.getHandle().requestedViewDistance() == 0) ? Bukkit.getViewDistance() : this.getHandle().requestedViewDistance(); return (this.getHandle().requestedViewDistance() == 0) ? Bukkit.getViewDistance() : this.getHandle().requestedViewDistance();
} }

2
patches/server/0084-Allow-projectiles-to-load-chunks-for-collisions.patch → patches/server/0081-Allow-projectiles-to-load-chunks-for-collisions.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow projectiles to load chunks for collisions
diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
index 5bc4ba7c055992a32197db96d86a3906c11900d8..f24f588a6a84d1014e8b2cca19cc1ced9f4c76e0 100644 index 72c48bf33a0b882e4c94f1a7c343a170b1db0f53..4cb3d683d9e103d625531dfd8065c308f04af4d6 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -219,7 +219,7 @@ public abstract class AbstractArrow extends Projectile { @@ -219,7 +219,7 @@ public abstract class AbstractArrow extends Projectile {

0
patches/server/0081-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch → patches/server/0082-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch
View File

4
patches/server/0082-PAPER-Improve-standard-messenger-logging.patch → patches/server/0083-PAPER-Improve-standard-messenger-logging.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] PAPER Improve standard messenger logging
Backported https://github.com/PaperMC/Paper/commit/7c9240f4a63b13be1fdcedbfb0270f9b49b75518 Backported https://github.com/PaperMC/Paper/commit/7c9240f4a63b13be1fdcedbfb0270f9b49b75518
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3ddd3fee5d8e2208c6e0afbdf68ca7344772fd8b..ed26fe6653fc01a73d78332243207fcbad033860 100644 index bafd9e135a38d78e7a040c744afe46a3cc96bc52..35be988be589c359ea5b3ead65f7dda0985f7d3a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2579,7 +2579,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -2580,7 +2580,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public void addChannel(String channel) { public void addChannel(String channel) {

26
patches/server/0083-PAPER-Use-player-file-not-directory-when-checking-fo.patch
View File

@@ -1,26 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sun, 18 Aug 2024 15:32:25 -0700
Subject: [PATCH] PAPER Use player file, not directory, when checking for
offline player data
When trying to fall back to offline player data in onlide mode,
we need to use the player file. This fixes a mistake during
update where 'file' was used, but the new code uses 'file1'
for the player file.
Backported https://github.com/PaperMC/Paper/commit/be1078f5f2e28c1a1de99e9c96e4003c3f96f6e8
diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
index 8ab7ca373a885fbe658013c9c6a2e38d32d77bb2..b148cf247acdd36f856d0495cde4cc5ad32b5a2f 100644
--- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
+++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java
@@ -78,7 +78,7 @@ public class PlayerDataStorage {
File file1 = new File(file, s1 + s);
// Spigot Start
boolean usingWrongFile = false;
- if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first
+ if ( org.bukkit.Bukkit.getOnlineMode() && !file1.exists() ) // Paper - Check online mode first
{
file1 = new File( file, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + name ).getBytes( java.nio.charset.StandardCharsets.UTF_8 ) ).toString() + s );
if ( file1.exists() )