Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +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@b9b4c9a Deprecate duplicate API for arrow stuck count (#8829)
PaperMC/Paper@57f1157 Updated Upstream (Bukkit/CraftBukkit) (#8823)
This commit is contained in:
granny
2023-02-08 20:24:09 -08:00
parent 5c6a830298
commit cbb7fc002e
23 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0179-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 018ba3fbe599c1c5b892b7bead5d3d4dad8386a8..3ca3fcbf65511fa8513c88a6b02a12f20444a505 100644
index fbc2ecdacde38efd488895b0ae1ba8caff647cb2..3891bdafc9dc1da0beeb9a9bb2c7b1149d84c5bd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4718,5 +4718,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -31,7 +31,7 @@ index 018ba3fbe599c1c5b892b7bead5d3d4dad8386a8..3ca3fcbf65511fa8513c88a6b02a12f2
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index a21b7c49163d205e807da1d2ae0007b89b7c0d2e..1739e848eae0cfab56e74d5200e3f939e83da233 100644
index 4630ea33547f07839adfc6af32975161149adf17..c9537bf9b98b0f0cd0c45ef4738ad8a9ea329638 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -266,6 +266,7 @@ public abstract class LivingEntity extends Entity {
@@ -91,7 +91,7 @@ index a21b7c49163d205e807da1d2ae0007b89b7c0d2e..1739e848eae0cfab56e74d5200e3f939
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 bbb8af6885d465a2a3882e362b2583539f547876..535b13206e4a8a68e1fb226b3c44890face3b55f 100644
index 57c1f778c0a10bcac251b2167b20481b3ec26234..af1c7af8e750ce62ac07fdce5f6915e997431e8c 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1711,17 +1711,7 @@ public abstract class Mob extends LivingEntity {
@@ -367,10 +367,10 @@ index 39ae7bdac23601c567013799375bf32b96d4e1fd..62ef6f620608f9b1147f525f5cc1540f
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 082510cfd3c371a55c19e633db4184fc9c5ee309..a0605955b7f3a24372dfa2c0ea6e94c47f5921eb 100644
index ce9e00d45a7b090fae5201a768fe587fb6d959de..e21a20d1c4c5c40ed96fc3226dd3accceb19ebe6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1071,5 +1071,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1077,5 +1077,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}