Skip to content

Commit 4e55e26

Browse files
committed
final 1.21 Paper upstream
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b1b5d4c Check shooter in configurable projectile relative velocity patch
1 parent 75e81d8 commit 4e55e26

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21-R0.1-SNAPSHOT
33

44
mcVersion = 1.21
5-
paperCommit = 4d7cef34181162e301365ada2d0a3e98b4a7cc88
5+
paperCommit = b1b5d4c1e4b7c95afd5c932ca392bee66533a60c
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

patches/server/0117-Add-mobGriefing-bypass-to-everything-affected.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
55

66

77
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
8-
index 609260d43c42d9978f5e849b4dd7191fd21a6c32..b07d0fc6cbcf209f5c69f4b43011d3f7182aa16c 100644
8+
index ffe1e4fdd908c8825e78c6e1c9aac6683c10a13a..2c47a6189030a06483db45e47d38a860472da6cc 100644
99
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
1010
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
1111
@@ -1845,7 +1845,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -284,10 +284,10 @@ index 28a65f2a9ef441ae96a7a635e0695b14ce2ee367..7b6c58a31d37896daccb5f570d3cb924
284284
// CraftBukkit start - fire ExplosionPrimeEvent
285285
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
286286
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
287-
index a01c0d9ae53d1b748c5da914069bd672cb1215c7..dcdca2374b4844d5ba06a01bd34b537c7d2a3339 100644
287+
index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..e8e1fe11d6c9042979345941833fa2895000c39a 100644
288288
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
289289
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
290-
@@ -361,7 +361,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
290+
@@ -367,7 +367,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
291291
public boolean mayInteract(Level world, BlockPos pos) {
292292
Entity entity = this.getOwner();
293293

0 commit comments

Comments
 (0)