Updated Upstream (Paper) (#967)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@608482d cleanup filtered sign text (#7777)
PaperMC/Paper@4166632 Updated Upstream (Bukkit/CraftBukkit) (#7776)
PaperMC/Paper@e564110 Couple fixes/improvements to PlayerSetSpawnEvent (#6754)
PaperMC/Paper@e5da93a Deprecate duplicate SoundGroup API (#7509)
This commit is contained in:
Oharass
2022-05-01 16:47:48 -05:00
committed by GitHub
parent a9042b304f
commit cda46a038f
12 changed files with 29 additions and 29 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 e234373432f34f237f884f7054c0d80829228522..22916618d5b5096802410a174c9a593d6a3a1121 100644
index 46102c28d10b11ecbafd3dda2de66982eaed8a00..fa88207befcee5e95c86479af1f8923eeeb0bce9 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -121,7 +121,7 @@ public class FallingBlockEntity extends Entity {
@@ -127,7 +127,7 @@ public class FallingBlockEntity extends Entity {
@Override
public void tick() {
// Paper start - fix sand duping
@@ -17,7 +17,7 @@ index e234373432f34f237f884f7054c0d80829228522..22916618d5b5096802410a174c9a593d
return;
}
// Paper end - fix sand duping
@@ -138,7 +138,7 @@ public class FallingBlockEntity extends Entity {
@@ -144,7 +144,7 @@ public class FallingBlockEntity extends Entity {
this.move(MoverType.SELF, this.getDeltaMovement());
// Paper start - fix sand duping