Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-30 20:29:14 +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@5a362b8 Use ConcurrentUtil from Paper repo
PaperMC/Paper@ef0670c Update paperweight and Gradle wrapper
PaperMC/Paper@e5bf173 Always fork jvm for compile, even when using the Gradle runtime jvm
PaperMC/Paper@cbd578c Fix api build script deprecation
PaperMC/Paper@7e601ad Implement new CustomModelData
PaperMC/Paper@3b35456 Implement assetid
PaperMC/Paper@d0645d9 Update readme, set updatingMinecraft to false
PaperMC/Paper@747cac4 Updated Upstream (CraftBukkit)
PaperMC/Paper@416a733 Apply coordinate offset only to VoxelShape
PaperMC/Paper@1cc86be Update setup-gradle action
PaperMC/Paper@b0d7153 fix item meta
PaperMC/Paper@2206b9a fix components
PaperMC/Paper@e73d396 fix asset id
PaperMC/Paper@2a4ba00 add missing effect cause, for bee being poisoned
PaperMC/Paper@4806ce5 properly override push/knockback methods
PaperMC/Paper@bb4fb53 call EntityInsideBlockEvent for eyeblossom
PaperMC/Paper@ae060b3 Finish PlayerPickItemEvent
PaperMC/Paper@c54c062 Port exact choice improvements (#11705)
PaperMC/Paper@e4e24f3 Move around patches again
PaperMC/Paper@4c39ea2 More moving around of hunks
PaperMC/Paper@77afb9a Add new bundle animation (#11708)
PaperMC/Paper@346b9b8 Fixup PlayerPickItemEvent docs more
This commit is contained in:
Samsuik
2024-12-05 21:55:07 +00:00
parent 3345cc305d
commit 7f8d0d086d
10 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0005-Client-Visibility-Settings.patch
View File

@@ -649,7 +649,7 @@ index 1a37654aff9a9c86c9f7af10a1cf721371f0c5ec..82644b34a77dc5e5af38260b7b07b3ec
public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, ShortSet positions, LevelChunkSection section) {
this.sectionPos = sectionPos;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0bdefa7ad46887fe3eb9045b63195541d3b792e1..1d0462b970304f543ff949f7aa32c67a1860ba4f 100644
index 1f9f023a43c16cc472deea5285b01c19136e019f..cf1e4cb1cdbda7dd1668ca40a788173942572a9e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1891,6 +1891,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -734,7 +734,7 @@ index cfeeddf2cb4ff50dbc29c6913e78ca1dee076790..d6c3f39cc9359f5d0fc5082949a7c860
// CraftBukkit start - respect vanish API
if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e587c16e03f6b3a3ed5a051115583fd288b94bab..0c1587b8ccf05e7a0a5df5a64c483cee434e1c0f 100644
index 876dc65f91bf09865563c8d583b78e4fdafd82b7..9ff9f5a5d9d156b3a2a939e67c412470b2631d8d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -595,6 +595,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -780,7 +780,7 @@ index e587c16e03f6b3a3ed5a051115583fd288b94bab..0c1587b8ccf05e7a0a5df5a64c483cee
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 8aff5b7dd14b835788348b22b1fec4d381df816f..5266e37ade8851a8b73a4ae12ecd67a8d0c6e09d 100644
index fc7f7a34babd095a51b5321f600aef65a2a9d123..2a9659158d39d4d5505328afd7a2d8dc9ecf456f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -357,6 +357,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -845,10 +845,10 @@ index b0bc66dc7248aae691dcab68b925b52a1695e63f..2f9413b9442cc7f95e1974a772812fe3
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
index 2fbe3d8722eeacc3b27ce38145aeffa610f9daab..e22f478c527e27b915cea68505316c6d22b899c0 100644
index 84fa24880d02dc7ba1ec8bda3575be38447fd4b2..52f79a8d1b7890ffba3495ca9390f0edc27e6f99 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3313,6 +3313,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -3314,6 +3314,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
event.setCancelled(cancelled);
AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
@@ -857,7 +857,7 @@ index 2fbe3d8722eeacc3b27ce38145aeffa610f9daab..e22f478c527e27b915cea68505316c6d
if (this.player.containerMenu != oldContainer) {
return;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 27618d07d718cb2a5783536e11d56f712303487b..20dac48cce9596217d1ebd1703e5ac2c0ede56e1 100644
index 1b547be0fe97119edf4f29666cfe0037e0c778e0..29045a4857aadbc7f9ae0c612555743ad404682d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -568,6 +568,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -896,10 +896,10 @@ index 809f5e847e2f5bb594c130cebd2cb897ea768d82..eebd53ac889da265cb259ba3cb8c1ce4
public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 84c494ca81b8f58604b372ac7236147776817a4f..d00fcfd5219a532204533f159d68524b2d33ccc7 100644
index 20f64850cb42d986358f01ffcdb42187e1684bca..f3f4b4df097e1e593ac5028f7d3db92fc407d831 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2394,6 +2394,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2395,6 +2395,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
handle.keepLevel = data.getBoolean("keepLevel");
}
}
@@ -913,7 +913,7 @@ index 84c494ca81b8f58604b372ac7236147776817a4f..d00fcfd5219a532204533f159d68524b
}
public void setExtraData(CompoundTag nbttagcompound) {
@@ -2423,6 +2430,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2424,6 +2431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
paper.putLong("LastLogin", handle.loginTime);
paper.putLong("LastSeen", System.currentTimeMillis());
// Paper end
@@ -925,7 +925,7 @@ index 84c494ca81b8f58604b372ac7236147776817a4f..d00fcfd5219a532204533f159d68524b
}
@Override
@@ -3082,6 +3094,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3083,6 +3095,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().allowsListing();
}