update upstream

gommehdnet · Aug 18, 2024 · c614282 · c614282
1 parent cbc4448
commit c614282
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ group=net.gommehd.cheetah
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=52ae4ad4666b34d637f2de573ed03c02b0fc6a24
+paperRef=64c9ee6584ce15e5b486bdc7183fe902e22fddf3
 
 org.gradle.caching=true
 org.gradle.parallel=true

diff --git a/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch b/patches/server/0004-added-ProjectileAllowCollideWithPlayerEvent.patch
@@ -21,7 +21,7 @@ index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..3b0cd13ac6837e58ab1eec800b4a1523
                  }
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8a27915a57780554d9ae877e4e0e3c0e17b9068a 100644
+index 77ef27f9254235180a8596c6c8c4af750dc759d1..5686b200c18fefca82e04c80d15186a00515bf85 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -15,6 +15,7 @@ import java.util.Map;
@@ -32,7 +32,7 @@ index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8a27915a57780554d9ae877e4e0e3c0e
  import net.minecraft.core.BlockPos;
  import net.minecraft.core.Direction;
  import net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
-@@ -1473,7 +1474,10 @@ public class CraftEventFactory {
+@@ -1475,7 +1476,10 @@ public class CraftEventFactory {
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
 
          if (projectile.getShooter() instanceof Player && collided instanceof Player) {
@@ -44,7 +44,7 @@ index 8dd85b9ca3b3e3429de4d0ec0654982589c6e93e..8a27915a57780554d9ae877e4e0e3c0e
                  event.setCancelled(true);
                  return event;
              }
-@@ -1484,6 +1488,15 @@ public class CraftEventFactory {
+@@ -1486,6 +1490,15 @@ public class CraftEventFactory {
      }
      // Paper end