mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 02:47:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@eb60bff Create raw chat type as resource file instead of in source (#9226) PaperMC/Paper@99b311d [ci skip] Clarify where furnace-related events are called (#8753) PaperMC/Paper@83cfeb1 Improve java version check (#9692) PaperMC/Paper@deb92c2 Add ItemStack#isEmpty and related methods (#9664) PaperMC/Paper@0c8e84c Enforce sign line nullability when setting line with Adventure Method (#9689) PaperMC/Paper@ede9c06 Fix Projectile#setOwner(null) not clearing owner (#9715) PaperMC/Paper@e312ebb Add DISPLAY tracking range type (#9668) PaperMC/Paper@06a741d Fix leashed pets teleporting to owner when loaded (#9686) PaperMC/Paper@064fb50 Cleanup old async commands patch (#8895) PaperMC/Paper@d8af99a Fix silent equipment change for mobs (#9677) PaperMC/Paper@3cec9c9 [ci skip] Add missing javadoc links (#9497) PaperMC/Paper@ba0e1f5 Fix sapling observer detection and grow event (#9654) PaperMC/Paper@a856073 Fix two beacon bugs (#9675) PaperMC/Paper@581b683 Fix spigot's Forced-Stats (#9663)
This commit is contained in:
@@ -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 c75d3490dd475fc7c1bd4931841cc84888a23bac..97dfdf4f5730d9f7c162f127bab38833cf757b4d 100644
|
||||
index 5b6b650e9fc477176d3229c28141d61ad50a2cda..47d1c9cd74454cb0ff2b3e0bcad40a3208129c7a 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||||
@@ -1772,7 +1772,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
||||
@@ -18,7 +18,7 @@ index c75d3490dd475fc7c1bd4931841cc84888a23bac..97dfdf4f5730d9f7c162f127bab38833
|
||||
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index 4e5a261ccb7fb63b82ac7194598729fd60a20840..d24f94f2c27523af10184cae27157169d5deabae 100644
|
||||
index 50747e73ab0a37073e431db82d79b1ebc024d347..6ae71386cdc0d30defd9a86b97f5e619d2dbf5fe 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -703,7 +703,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
|
||||
@@ -284,10 +284,10 @@ index 251e6bc87eb02ec4372062ef22b21249ac5164ff..6b60597a0e837054b0d1891c1e6e5e7c
|
||||
// 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 459aee61b519a40d9136546c0d9356562f5757c8..134b5758e5c6335a52ffb2703c3fa98dc792948e 100644
|
||||
index cd0629581bae5f805842157af36c2d838e01bee3..b0a559dfefac693bda8692a30fbaa5ac8062ef27 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
|
||||
@@ -319,6 +319,6 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
||||
@@ -326,6 +326,6 @@ public abstract class Projectile extends Entity implements TraceableEntity {
|
||||
public boolean mayInteract(Level world, BlockPos pos) {
|
||||
Entity entity = this.getOwner();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user