Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,10 +22,10 @@ index 8fd399f791b45eb7fc62693ca954eea0c68e2881..22705359d5b3b1af522ff5575c07ca5e
* @deprecated removed in 1.16
*/
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 4d4a0d15876cc48c9c0456b9f11a5dda37fd56ce..dd7df647f98fe72694fb7615e5cd1192724b7812 100644
index 6dd81f07ef4d6993187987d3352a01771ffb715e..20b00b0c12b848c171fa43d53ce53428e0f424a6 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -919,4 +919,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -946,4 +946,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
// Paper End - Collision API

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 a1dba2bcc2a636718a6f377907afc82add617fa2..4f74fb77fb516ff99e04ec2cf2a00c7acbb00c44 100644
index 4af5e8d0cba6555f7615e4e809d9aff221c0dc4d..8cd72cd63695ec0b8900adaa967d8f22469b72a8 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -917,4 +917,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -986,4 +986,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setHurtDirection(float hurtDirection);
// Paper end

4
patches/api/0022-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 4f74fb77fb516ff99e04ec2cf2a00c7acbb00c44..c0d725cdf0699162347f817e1f7187baa53ab037 100644
index 8cd72cd63695ec0b8900adaa967d8f22469b72a8..193901442dd6d5e0c85269b42083f63759120d06 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -932,5 +932,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1001,5 +1001,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

8
patches/api/0034-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 dd7df647f98fe72694fb7615e5cd1192724b7812..1f116f33e6dbce8d8d67d799beeedecf792cd728 100644
index 20b00b0c12b848c171fa43d53ce53428e0f424a6..be7ad89699619aba9df4699403c9a70fd2bc9da1 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -949,5 +949,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -976,5 +976,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if ridable in water
*/
boolean isRidableInWater();
@@ -23,10 +23,10 @@ index dd7df647f98fe72694fb7615e5cd1192724b7812..1f116f33e6dbce8d8d67d799beeedecf
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index c0d725cdf0699162347f817e1f7187baa53ab037..a9b79beb8d16ed74c953ff46ad61945327d685e8 100644
index 193901442dd6d5e0c85269b42083f63759120d06..4a4606f2598b868e43c270cd3056d44549bc914e 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -939,5 +939,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1008,5 +1008,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);