mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-22 08:19:26 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@956b3d1 Ensure MaterialChoice materials are items (#11325) PaperMC/Paper@5625051 Prevent duplicate pickup event for piglins (#11322) PaperMC/Paper@94444ce Fix incorrect timestamp in region file header recalculation (#11318) PaperMC/Paper@5b2c43e Remove set damage lootable item function from compasses (#11317) PaperMC/Paper@5167856 Fix despawn ranges by defaulting to an ellipsoid shape (#11312) PaperMC/Paper@e2da65c Deprecate API relating to menu title changes (#11309) PaperMC/Paper@ad4c524 Properly destroy placed blocks on the end platform (#11292) PaperMC/Paper@374d9c8 Add a method to reset Lodestone compasses back to normal ones (#11308) PaperMC/Paper@dd8c70a Ensure TabCompleteEvent always has a mutable backing list. (#11302) PaperMC/Paper@a7b8d95 Add enchantment seed update API (#11282) PaperMC/Paper@789a267 Re-implement maxLeashDistance world conf and call missing event (#11301) PaperMC/Paper@e08e667 Fix: synchronise sending chat to client with updating message signature cache (#11332)
This commit is contained in:
@@ -465,10 +465,10 @@ index b43f87ff4b9853b5d4bbea5ff9686d64d9d0d26b..79533a1677430039f410f66b55927e1d
|
||||
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 b13057c0792067cc6b0abdf0d64a9be2cc9389a4..7f0a2a9d30bb06e69d4d6065bcf38e457688d887 100644
|
||||
index 4320af392b7bd29d6a5d6da44361ffd0da16036a..797707c97dec5c89aaaeb2f2bb6ac39808f6e394 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -3209,6 +3209,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -3213,6 +3213,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
|
||||
event.setCancelled(cancelled);
|
||||
AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
|
||||
@@ -477,7 +477,7 @@ index b13057c0792067cc6b0abdf0d64a9be2cc9389a4..7f0a2a9d30bb06e69d4d6065bcf38e45
|
||||
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 490ee48346395fcbaf2eb0151e9248f18974fea6..84be48a2fb7d99fac15f2f71576e82503a84da79 100644
|
||||
index e0827d8bb3fa17d4f590a5342ff41a514f623e68..0c453d7584c539cb8dfb70c325da652808ec0aa6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -549,6 +549,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
|
||||
Reference in New Issue
Block a user