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] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 152d4f5be6ec00e3a38aeeaf89fbfddfafdc21c3..ceb6d67079819b5ef293b030875666eb8de7095c 100644
index e070c4dc4f8583b7d5c10b353c5e21304add0233..9f282439d30ada6b206153d65812b772bcaa1e45 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1176,6 +1176,7 @@ public class ServerPlayer extends Player {
@@ -17,10 +17,10 @@ index 152d4f5be6ec00e3a38aeeaf89fbfddfafdc21c3..ceb6d67079819b5ef293b030875666eb
// CraftBukkit end
this.setLevel(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 213dc23771b85da8db6825c4ba5463abe42f690c..5225812252721bd183957bd43bc485b2d7b9208d 100644
index aab048f2bf12b2f956c3946ba8446aa58bf5826c..44a03a3e9b34651f45d94a71c9c4272cd0bdc4af 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2780,12 +2780,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2781,12 +2781,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return Vec3.directionFromRotation(this.getRotationVector());
}