mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-30 12:19:08 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@deaccd2 [ci skip] Add file reference url to help.yml (#12481) PaperMC/Paper@f86b435 Add vault change state event (#12069) PaperMC/Paper@3e3b42c Update player chat session sync (#12382) PaperMC/Paper@f8fa4f6 Add method to retrieve FishHook (#12310) PaperMC/Paper@b9d3147 Use correct placed block position for sound (#12410) PaperMC/Paper@952338b [ci skip] Add missing exception docs to Player#listPlayer (#12488) PaperMC/Paper@1db3785 [ci skip] improve javadoc for off-hand swaps through getHotbarButton (#12489) PaperMC/Paper@d1810f2 Allow Server#getDefaultGameMode before worlds are initialized (#12490) PaperMC/Paper@02d20ff Fix NPE in Server#getMap before worlds are loaded (#12492) PaperMC/Paper@9e873f5 Fix inconsistencies between offline/online spawn position getter (#11960) PaperMC/Paper@fc0c371 Fix handling of resultant crafting container from craftItemResult (#12307) PaperMC/Paper@a7a76c8 Add methods for Armadillo (#12031) PaperMC/Paper@a74400d Update adventure to 4.21.0 (#12499) PaperMC/Paper@1e93076 Fix ipv6 loopback addresses being able to get connection throttled (#12155) PaperMC/Paper@646b80c Fix unnecessary map data saves (#12296) PaperMC/Paper@e663f99 Add combat tracker API (#11853) PaperMC/Paper@cd4fe5b [ci skip] Drop non-applicable ATs (#12498) PaperMC/Paper@5acfdd6 Fix save/load NaN Entity Motion (#12269) PaperMC/Paper@2754d7c Add Throw EntityChangeBlockEvent for BrushableBlockEntity#brush (#12133) PaperMC/Paper@567f63a Parity for respawn events (#11792) PaperMC/Paper@bc3d946 Normalizes CraftEntity#toString/getHandle (#12170) PaperMC/Paper@0e9b94d Fix ItemStack amount issues with Chat Components (#12216) PaperMC/Paper@835b955 Add a method on InventoryView to get the MenuType (#12193) PaperMC/Paper@c9411bf Fix min ItemStack amount check for asHoverEvent (#12505) PaperMC/Paper@1acf3b3 Infer block entity data in brigadier blockstate argument (#12197) PaperMC/Paper@b9b3cd6 Use components instead of ChatColor in more places (#12507) PaperMC/Paper@ec42171 Add missing spaces back (#12508) PaperMC/Paper@51345a1 Correct nullable fall location type PaperMC/Paper@93246a0 Fix errors when loading raid files without a PDC PaperMC/Paper@cb3ffd0 Don't store empty PDCs on raids PaperMC/Paper@d637ae8 Fix NoSuchElementException in EntityTransformEvent for slimes (#12510) PaperMC/Paper@1074237 Pass correct draw strength for EntityShootBowEvent (#12308) PaperMC/Paper@825685f Add PlayerPickBlockEvent and PlayerPickEntityEvent (#12425) PaperMC/Paper@2bd84f6 Expand PotionMeta Api to allow getting effective potion colour and effects (#12390) PaperMC/Paper@6f1f5b6 Fix ArmorStand items for canceled EntityDeathEvent (#12288)
This commit is contained in:
@@ -132,7 +132,7 @@ index 8097ad52b8c38726155251376015fca2105f5547..2ed1d5d504a69c03f4860f05e146c320
|
||||
}
|
||||
|
||||
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
|
||||
index 688e1a452a0b9d80d38b3fa2b9b0630c5124dc7e..4704436b85c3b326cdc03e64e507ba10d1b21449 100644
|
||||
index 0689dc62a9fefc6d3876787f7d67c0ab4b12716b..1771460df96e294bb9547568d6f00708fa672a4a 100644
|
||||
--- a/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -459,6 +459,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
|
||||
@@ -195,10 +195,10 @@ index 186393485396cfe9b1baef29586198356e2d2600..a06f5a9b577cd9cc2cb948b2801b0aec
|
||||
}
|
||||
}
|
||||
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index deddc0b3b9e7f4ff299feab2ebb8ddb2a4cfa6e2..315a6f3f15aa9965a170d3f9d5e09c9ac1e1b774 100644
|
||||
index 064a9b6cf6792192fc1fa80095a48c2025cebf2a..266a8e6b164d6d76c2fc26c986290569781cf871 100644
|
||||
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -3190,6 +3190,7 @@ public class ServerGamePacketListenerImpl
|
||||
@@ -3192,6 +3192,7 @@ public class ServerGamePacketListenerImpl
|
||||
|
||||
event.setCancelled(cancelled);
|
||||
net.minecraft.world.inventory.AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
|
||||
@@ -207,7 +207,7 @@ index deddc0b3b9e7f4ff299feab2ebb8ddb2a4cfa6e2..315a6f3f15aa9965a170d3f9d5e09c9a
|
||||
if (this.player.containerMenu != oldContainer) {
|
||||
return;
|
||||
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
|
||||
index 607a3243074d1a67c413d33493fa7b8d9d3055d8..ec7687616eb0bc0f1149d990051a5d67b04edc19 100644
|
||||
index 76945e5eab70734015995288faa51c7cc5438d08..ca2939dcc380989d87bed516c4b7a73be90ebf06 100644
|
||||
--- a/net/minecraft/world/entity/Entity.java
|
||||
+++ b/net/minecraft/world/entity/Entity.java
|
||||
@@ -512,6 +512,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
||||
|
||||
Reference in New Issue
Block a user