Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37: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@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
granny
2023-12-25 18:45:01 -08:00
parent 6aec125590
commit 10685bb957
24 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0171-API-for-any-mob-to-burn-daylight.patch
View File

@@ -32,7 +32,7 @@ index c45e7caa0ecbeaa1b37f722abba2884a6148ca20..01bf0886d8196ec0a09e7b399636874b
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 f1f225615dd4a325ea29552f58fb9a6ff982a943..36d4d360c1f60d884f067391b7790e001010b45d 100644
index 460619aabe69e8837f413c65aa4a575cd5d0d620..bfdfb7cfc36fa3eb4c8c2cfa293dcadcef107a11 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -353,7 +353,7 @@ index 52a576a16bfeb7dc6ec97280f9a5e0f408d71e46..9b1ae2fa1681f1212b6a09d5b10b1663
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index fb80b7e2edebf915a98ef608d5b2e27a6c9ae79c..1ac0f0faab8d6a22429f16ea745640bba65ef4ab 100644
index 98d2ef7870c921093a9dbaf0f4de77d86ef81d44..bfd8f6d85272f3ecbb0f7fc5fc92d2055205c0e0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -83,6 +83,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -369,10 +369,10 @@ index fb80b7e2edebf915a98ef608d5b2e27a6c9ae79c..1ac0f0faab8d6a22429f16ea745640bb
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 c5d245649ce3b609f3de360dc9569af410a1de80..741207b28a57a92d12d02ce3179eb50482ef0c43 100644
index 12c7505c2ce562b3188c079952e57ae1fab5268b..10ca0fdb5b92cc4f1d346540c9129d5c55732985 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1136,5 +1136,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1135,5 +1135,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}