Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01: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@9ec7dfc Move invisible setting up to entities (#10346)
PaperMC/Paper@b600140 Add methods to change entity physics (#10334)
This commit is contained in:
granny
2024-03-24 13:47:00 -07:00
parent 5bf09622ee
commit b7e80840c6
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0007-Ridables.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index d9929d9311e4b2b0ae13a8f6f13563257263f298..ee617a8681d2d887216d63211ed0595dc1fe7ddb 100644
index 967125e99adc1b5446f42811d60ef44ba56ef5f5..02418d7d976147c70375002452cb39a4325de215 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1104,4 +1104,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1138,4 +1138,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name

4
patches/api/0013-LivingEntity-safeFallDistance.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index e67455efc84f1e06d3396291d104ce65fee4591b..11194fc3c63ed301d281fc4b41c4d80bbf3d9e27 100644
index 5cb82901a5d0c8ee673501fc53389d526d4a5b6f..4051906aa47dc2392f1f47aceaefa09aaf45c2ee 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1310,4 +1310,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1312,4 +1312,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setBodyYaw(float bodyYaw);
// Paper end

4
patches/api/0018-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 11194fc3c63ed301d281fc4b41c4d80bbf3d9e27..229edcfb9de39e2ef10597c1d65044f26eaeba48 100644
index 4051906aa47dc2392f1f47aceaefa09aaf45c2ee..f16a6eb97dcea3009023bffada76393792462e53 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1325,5 +1325,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1327,5 +1327,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

8
patches/api/0027-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index ee617a8681d2d887216d63211ed0595dc1fe7ddb..9fee171108e335827c5c164144284eb5a598742c 100644
index 02418d7d976147c70375002452cb39a4325de215..644f58eeef73bab67ab50b16b87e7c2e798ea2c0 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1134,5 +1134,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1168,5 +1168,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if ridable in water
*/
boolean isRidableInWater();
@@ -23,10 +23,10 @@ index ee617a8681d2d887216d63211ed0595dc1fe7ddb..9fee171108e335827c5c164144284eb5
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 229edcfb9de39e2ef10597c1d65044f26eaeba48..744b869c028324d5de30d2d64ab080b050fa3c47 100644
index f16a6eb97dcea3009023bffada76393792462e53..91ce069e4f23a115a01b329dcf053ed19dfb83bc 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1332,5 +1332,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1334,5 +1334,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param slot Equipment slot to play break animation for
*/
void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);

4
patches/api/0046-Fire-Immunity-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fire Immunity API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9fee171108e335827c5c164144284eb5a598742c..a36fc32dd83339b6939cb4046538ec6285042397 100644
index 644f58eeef73bab67ab50b16b87e7c2e798ea2c0..c83293ced48a0f43cb9314d306321e26b469f51e 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1141,5 +1141,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1175,5 +1175,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if in daylight
*/
boolean isInDaylight();