Skip to content

Commit

Permalink
final 1.21 Paper upstream
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b1b5d4c Check shooter in configurable projectile relative velocity patch
  • Loading branch information
granny committed Aug 10, 2024
1 parent 75e81d8 commit 4e55e26
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21-R0.1-SNAPSHOT

mcVersion = 1.21
paperCommit = 4d7cef34181162e301365ada2d0a3e98b4a7cc88
paperCommit = b1b5d4c1e4b7c95afd5c932ca392bee66533a60c

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected


diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 609260d43c42d9978f5e849b4dd7191fd21a6c32..b07d0fc6cbcf209f5c69f4b43011d3f7182aa16c 100644
index ffe1e4fdd908c8825e78c6e1c9aac6683c10a13a..2c47a6189030a06483db45e47d38a860472da6cc 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1845,7 +1845,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
Expand Down Expand Up @@ -284,10 +284,10 @@ index 28a65f2a9ef441ae96a7a635e0695b14ce2ee367..7b6c58a31d37896daccb5f570d3cb924
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index a01c0d9ae53d1b748c5da914069bd672cb1215c7..dcdca2374b4844d5ba06a01bd34b537c7d2a3339 100644
index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..e8e1fe11d6c9042979345941833fa2895000c39a 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -361,7 +361,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -367,7 +367,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
public boolean mayInteract(Level world, BlockPos pos) {
Entity entity = this.getOwner();

Expand Down

0 comments on commit 4e55e26

Please sign in to comment.