mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper & Tuinity)
Upstream has released updates that appear to apply and compile correctly Paper Changes:0aa3cc7228Suppress deprecation registration warnings for brigadier events (#6297)81a7559b41Correct handling of invalid maps (#6302) Tuinity Changes:5620c57206Use Velocity compression and cipher natives (#351)3be4fc5809[CI-SKIP] Redirect to CI when clicking CI badge in README (#344)
This commit is contained in:
@@ -139,10 +139,10 @@ index c9a44a4765f43b9c0247ed1005f4c13469bdee95..6d08c8c31a32ea38f06410fbaddf19b9
|
||||
public boolean canTakeItem(ItemStack stack) {
|
||||
net.minecraft.world.entity.EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
index 5963b407d936e930a370677113ba947d2c2a198d..b60e38add38ac58d01f419dcb1b07a9b79bf1cb8 100644
|
||||
index ace974dd50765602aa234cb7be9151714f072f5a..24523dd712329f2f3abe40bb3f1801ef7946e831 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||||
@@ -1989,6 +1989,52 @@ public abstract class Player extends LivingEntity {
|
||||
@@ -1991,6 +1991,52 @@ public abstract class Player extends LivingEntity {
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user