Update Paper

LeavesMC · Jul 12, 2024 · 2e58743 · 2e58743
1 parent 6acec7a
commit 2e58743
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,6 @@ version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
 org.gradle.jvmargs=-Xmx2G
-paperRef=0e02aa5b8e973c1a1deb15eaef6389212cf41eb3
+paperRef=70ff1ec0793d2176915e8da3e3ef100093d5bedf
 preVersion=true
 updatingMinecraft=true
diff --git a/patches/server/0003-Delete-Timings.patch b/patches/server/0003-Delete-Timings.patch
@@ -1343,7 +1343,7 @@ index cb61462d4691a055a4b25f7b953609d8a154fdfe..b2b97c4c61ea5b6f7ec199fabbd1bd1c
          return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4c4050fe8f3b788481350caeb2077fa91be12060..428b42c2ac49cce7d4d99abaf6518c771d19117e 100644
+index fe435d4a387bb28be6831cec0c8bb0a7c8b603a4..e310b84fcf4dd4efddb12eb49dc7e76b6ffb73fe 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1496,10 +1496,10 @@ index ed8032495af9ce9c23419224814b8d27e4a97c17..189a6bd4967aba72e12170e091dbb5b7
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 2ff21c5a9f7bcecb57ffaaafecc1462ca5456e48..6126fcb1bd724870068db0c39505a466b18cc320 100644
+index a7108b2be0746aa1f0e574d8c6f5ffad6d369835..3a68a32a359f13850262ac1ec07810053f806f7c 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -102,13 +102,6 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -103,13 +103,6 @@ public class Block extends BlockBehaviour implements ItemLike {
              this != Blocks.STRUCTURE_BLOCK &&
              this != Blocks.JIGSAW;
      }

diff --git a/patches/server/0014-Budding-Amethyst-can-push-by-piston.patch b/patches/server/0014-Budding-Amethyst-can-push-by-piston.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Budding Amethyst can push by piston
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 6126fcb1bd724870068db0c39505a466b18cc320..bf4b451487bb308c088fde578f5c6524544df7b2 100644
+index 3a68a32a359f13850262ac1ec07810053f806f7c..997280cd6131b14396d6fb37c293a6d4cc118412 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -588,6 +588,12 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -589,6 +589,12 @@ public class Block extends BlockBehaviour implements ItemLike {
      }
      // Spigot end
 

diff --git a/patches/server/0039-Alternative-block-placement-Protocol.patch b/patches/server/0039-Alternative-block-placement-Protocol.patch
@@ -63,10 +63,10 @@ index f8f909ebdad5e96379e8bd8c610164ef0697368e..0b761f3ae15ad4a3b8152f497a604032
                  if (iblockdata2 != null && this.canPlace(world, iblockdata2, blockposition)) {
                      iblockdata1 = iblockdata2;
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index bf4b451487bb308c088fde578f5c6524544df7b2..1c65e73c81a1aef33ea01d0d2f82ebf6ab566299 100644
+index 997280cd6131b14396d6fb37c293a6d4cc118412..9740426bbe54e23d833cf93346de344ff089168b 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -411,6 +411,33 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -412,6 +412,33 @@ public class Block extends BlockBehaviour implements ItemLike {
 
      public void stepOn(Level world, BlockPos pos, BlockState state, Entity entity) {}
 

diff --git a/patches/server/0079-Cache-BlockStatePairKey-hash.patch b/patches/server/0079-Cache-BlockStatePairKey-hash.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Cache BlockStatePairKey hash
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 1c65e73c81a1aef33ea01d0d2f82ebf6ab566299..137344b81d8060c49353898cd85af805f8572470 100644
+index 9740426bbe54e23d833cf93346de344ff089168b..ad79aab6b9c2cb6636f86225fb7f68858c3b8d53 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
-@@ -626,11 +626,18 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -627,11 +627,18 @@ public class Block extends BlockBehaviour implements ItemLike {
          private final BlockState first;
          private final BlockState second;
          private final Direction direction;
@@ -28,7 +28,7 @@ index 1c65e73c81a1aef33ea01d0d2f82ebf6ab566299..137344b81d8060c49353898cd85af805
          }
 
          public boolean equals(Object object) {
-@@ -646,11 +653,17 @@ public class Block extends BlockBehaviour implements ItemLike {
+@@ -647,11 +654,17 @@ public class Block extends BlockBehaviour implements ItemLike {
          }
 
          public int hashCode() {