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,10 +5,10 @@ Subject: [PATCH] Add toggle for sand duping fix
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 46102c28d10b11ecbafd3dda2de66982eaed8a00..fa88207befcee5e95c86479af1f8923eeeb0bce9 100644
index 318ea6ebf4c13a984b3815f00bf6cb3856ff6fe0..ae35add70d25c6c202e24237d6626665bb1bdcd5 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -127,7 +127,7 @@ public class FallingBlockEntity extends Entity {
@@ -128,7 +128,7 @@ public class FallingBlockEntity extends Entity {
@Override
public void tick() {
// Paper start - fix sand duping
@@ -17,7 +17,7 @@ index 46102c28d10b11ecbafd3dda2de66982eaed8a00..fa88207befcee5e95c86479af1f8923e
return;
}
// Paper end - fix sand duping
@@ -144,7 +144,7 @@ public class FallingBlockEntity extends Entity {
@@ -145,7 +145,7 @@ public class FallingBlockEntity extends Entity {
this.move(MoverType.SELF, this.getDeltaMovement());
// Paper start - fix sand duping