Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f6a69de Undeprecate getOfflinePlayer (#7773)
PaperMC/Paper@a117da6 Add PlayerStopUsingItemEvent (#7787)
PaperMC/Paper@f3a8a0b FallingBlock auto expire setting (#7037)
PaperMC/Paper@4219389 Don't tick markers (#7299)
PaperMC/Paper@2515bc4 Improve configurable door difficulty (#6985)
PaperMC/Paper@8c9d98e Clean unused field for Configurable door breaking difficulty (#7793)
PaperMC/Paper@b831784 Only log for passenger / vehicle world mismatch
PaperMC/Paper@7a6163b Add Alternate Current's redstone implementation as an alternative to Vanilla and Eigencraft's. (#7701)
PaperMC/Paper@1a17a83 Move redstone config changes to Eigencraft patch
This commit is contained in:
Encode42
2022-05-07 14:07:40 -04:00
parent 4e4f0df40d
commit 492436a23b
27 changed files with 108 additions and 108 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index ddf4345c48b9033f96ba237fc5c338578e39764b..5c445772eb244bd31316be3f78305614c46b9363 100644
index 2dcb24145bf07b186b853bd3e4c4be46495575d8..c2507dead89ea66ea8d2bf9081cbe30b7c4eb7dc 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1698,6 +1698,26 @@ public class ServerPlayer extends Player {
@@ -36,7 +36,7 @@ index ddf4345c48b9033f96ba237fc5c338578e39764b..5c445772eb244bd31316be3f78305614
public void displayClientMessage(Component message, boolean actionBar) {
this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 188c68d4ae46bc05c6d9c901b5c6ab883fa05ea4..1d96cb7914c93bb822968ad485d69c32121543c8 100644
index 95fe4240f3e1174ec36598f24d63f0073c13b376..563999906b3f8a79e9bd090cb13d946577a4781b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1384,6 +1384,62 @@ public abstract class PlayerList {
@@ -123,10 +123,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..67e559d63c543ff716d610cb04ff9426
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 570a9f1a3387ac42a3c935519aa1656f9d016504..c0339051f82d60f07cad2b9e23b8ea14dc229300 100644
index 4e6cbb858806cbf73dbf195bb436bbeff1a5b92a..de9d25ff83818ae0943fd0ed59512bef073a61a2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3681,6 +3681,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3682,6 +3682,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}