Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f8beab5 correct argument check in PlayerHandshakeEvent#setFailMessage(String) (#7940)
PaperMC/Paper@c80df84 Readd remove vec allocations diff (#7930)
PaperMC/Paper@1ccff4f Readd mc-4 fix
PaperMC/Paper@d7165b0 Fix some references to obfuscated code
PaperMC/Paper@55201f0 Updated Upstream (Bukkit/CraftBukkit) (#7936)
This commit is contained in:
BillyGalbreath
2022-06-11 04:47:17 -05:00
parent 596d6ce72d
commit 4c6cda520d
6 changed files with 15 additions and 15 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2619685affa6a3fa8fee4fdc3047e44ab7e7042e..6b92be36b86ecc5a82b4ca70ba187c53ec102adc 100644
index d032cd8054bcba9fd29ea62b234e6453e0a44adf..c5898834338046237d2690fd82443ac6844055a2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4557,5 +4557,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4567,5 +4567,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean processClick(InteractionHand hand) {
return false;
}