Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-04 15:31:43 +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@6cfa2f7 [ci skip] Add missing nullability annotation to sendEquipmentChange method (#12112)
PaperMC/Paper@9b9de82 Update Alternate Current patch to v1.9.1 (#12115)
PaperMC/Paper@c62252e Add lore content guard (#12116)
PaperMC/Paper@4041678 [ci-skip] Mention missing World#regenerateChunk implementation in jd (#12109)
PaperMC/Paper@a6e82d9 [ci skip] Clarify getChunkAtAsyncUrgently javadocs (#12125)
PaperMC/Paper@cb25c0c [ci skip] Fix annotation fields used in NMS getBukkitEntity (#12120)
PaperMC/Paper@0070126 [ci skip] improvement example in javadoc for DatapackRegistrar (#12122)
PaperMC/Paper@608f004 add method on ItemStack to edit pdc (#12022)
PaperMC/Paper@7bee997 Cleanup damage source a bit (#12106)
PaperMC/Paper@b9023b5 Add EntityAttemptSmashAttackEvent (#12113)
PaperMC/Paper@a3781ff Separate tick count to ensure vanilla parity (#12077)
PaperMC/Paper@2a4a115 Add EntityEquipmentChangedEvent (#12011)
PaperMC/Paper@06f96dd Improvement in /plugins command (#12121)
PaperMC/Paper@28d07dc use correct spigot plugin count
PaperMC/Paper@60394c5 Fix PlayerReadyArrowEvent cancellation desync (#12111)
PaperMC/Paper@b27e11c Fix bad world to chunk coordinate example in javadocs (#12131)
PaperMC/Paper@88cdd22 Fixup luck and random implementation in CB loot-tables (#11926)
PaperMC/Paper@84609dc Don't auto-create any brig redirects (#11954)
PaperMC/Paper@8eb8e44 Allow For Default Titles in InventoryView Builders (#12013)
This commit is contained in:
Samsuik
2025-02-17 16:30:33 +00:00
parent a1f50ad82f
commit a342cb1722
17 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch
View File

@@ -78,7 +78,7 @@ index 8f9f759885a9cda57ae7d665ec309a57e12969fd..e096463443639e9eef5311d7154f6d2a
if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
flag = false;
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index b49a0c3eb4236c71e390f42278412dce59e98cbd..0604b5075122494ec82b4e1b458645958b93c806 100644
index ca41cfe5f36b5820238df4ec4d2c749668b750f1..f2c0cd46a64fbc3fc7e6cb77acac353bb84d4073 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -569,6 +569,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -111,7 +111,7 @@ index b49a0c3eb4236c71e390f42278412dce59e98cbd..0604b5075122494ec82b4e1b45864595
}
// Paper start
@@ -1854,7 +1870,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -1856,7 +1872,18 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
for (ServerPlayer serverPlayer : this.players) {
if (serverPlayer.distanceToSqr(vec3) < 4096.0) {
Optional<Vec3> optional = Optional.ofNullable(serverExplosion.getHitPlayers().get(serverPlayer));
@@ -195,7 +195,7 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa729592002
}
}
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 882dbb1276c548316938bbc50f5f7e01f8547ff8..b2079b8c8ba713f48c89ccd7c871af1ff4beb21e 100644
index 660f9d44739909150635beaa2082e85dfde915c4..648d9219cd496b1793198d5914665c346449b22e 100644
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3192,6 +3192,7 @@ public class ServerGamePacketListenerImpl
@@ -207,10 +207,10 @@ index 882dbb1276c548316938bbc50f5f7e01f8547ff8..b2079b8c8ba713f48c89ccd7c871af1f
if (this.player.containerMenu != oldContainer) {
return;
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index a652ed38dd54c43547e272204154e791fb666f48..d0107d42212ddff92b5637205417e98ac76dfd69 100644
index 362c9516850fa20719a234309d2416fde5e5b324..789a64f13185b8d761e290e931ed31f8c04c6255 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -522,6 +522,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -523,6 +523,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
// Paper end - optimise entity tracker
public boolean pushedByFluid = true; // Sakura - entity pushed by fluid api