Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02:17:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8e6554a Fix sending disconnect packet in phases where it doesn't exist
PaperMC/Paper@06e69c8 Use CommandSourceStack in AsyncPlayerSendCommandsEvent (#10826)
PaperMC/Paper@a47e11d fix knockback events (#10831)
PaperMC/Paper@3181470 Add entity heal API (#10267)
This commit is contained in:
granny
2024-05-30 18:44:08 -07:00
parent b1464f3bf7
commit ee56117c43
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0169-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 126a11c27deb848c86e81ae6e63610c5bb711956..888e44f730725e6dee0a1414a3e75538dda87c14 100644
index 0eea9e29170a365e96659bcea2dea283d6f1ceda..ed2b8138d23e94b5471181396f290c530e29254b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -561,6 +561,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -32,7 +32,7 @@ index 126a11c27deb848c86e81ae6e63610c5bb711956..888e44f730725e6dee0a1414a3e75538
return this.hardCollides;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 7eb32e29ce009b161599196eb28f0dca11dfc548..2fc36b716ce636929e2323651302fd76358dc3e2 100644
index 15f89efd59c7f6334483c67d49e3de6dd03921c9..12f37b245901b84b4cee4e75d38446a554b2274b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -274,6 +274,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -63,7 +63,7 @@ index 7eb32e29ce009b161599196eb28f0dca11dfc548..2fc36b716ce636929e2323651302fd76
}
// CraftBukkit start
@@ -3573,6 +3580,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3563,6 +3570,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}
@@ -92,7 +92,7 @@ index 7eb32e29ce009b161599196eb28f0dca11dfc548..2fc36b716ce636929e2323651302fd76
public boolean isSensitiveToWater() {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 456c3197cc72d63e9c53a768ca7bae45bb1fc722..9d532c373ca1762ad48b9b81000d2c11b929d220 100644
index 3bb977f7b4861c92cf2c036bdf720cf6323964b0..3486c6782f9bbb3477d2fefd1e0a363a5326999f 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1881,17 +1881,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -361,10 +361,10 @@ index befe3372d5f1550b7bde3b63b5e7aef9035c5379..3c674ecd3b80501047b4593e88720342
Preconditions.checkArgument(entity != null, "Unknown entity");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 54537d1b981d690bc8c5a698fd07425a04070553..d5dfc97f40df7a7161bdaeb04ae6ca5e1a8c8a2b 100644
index f234cc33ad0e1f308daef6a09e1755bc23497294..fbb1b3672af69306c510f3a629bede548ba7a9fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1180,5 +1180,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1187,5 +1187,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}