Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@7f85940 Updated Upstream (Bukkit) (#10255)
PaperMC/Paper@7ccefdc Fire entity knockback event for ownerless tnt (#7171)
This commit is contained in:
granny
2024-02-16 18:39:14 -08:00
parent d0e4b7ba9e
commit d66bc35cd8
6 changed files with 13 additions and 13 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 9022567f32a58b94ed030db22524876d8f1df4aa..9fedbceb7f0cd65594a7084d9743373704333ad6 100644
index d9929d9311e4b2b0ae13a8f6f13563257263f298..ee617a8681d2d887216d63211ed0595dc1fe7ddb 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1102,4 +1102,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1104,4 +1104,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name

4
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 9fedbceb7f0cd65594a7084d9743373704333ad6..c646c51674f348bec6e2dee796cde5710da7bb67 100644
index ee617a8681d2d887216d63211ed0595dc1fe7ddb..9fee171108e335827c5c164144284eb5a598742c 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1132,5 +1132,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1134,5 +1134,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if ridable in water
*/
boolean isRidableInWater();

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 c646c51674f348bec6e2dee796cde5710da7bb67..f842fd5505f1e52b81299da179ed26780a1a1a13 100644
index 9fee171108e335827c5c164144284eb5a598742c..a36fc32dd83339b6939cb4046538ec6285042397 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1139,5 +1139,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1141,5 +1141,18 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if in daylight
*/
boolean isInDaylight();

4
patches/api/0052-Stonecutter-damage.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stonecutter damage
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index 3b20000d9ac3e29fe3bc5093e6635377bee88dbd..fae6f2c125eb6db88f3e8741b77f17b6817d62a9 100644
index 446b3ffd5caca5344be1c250475679834cd0d4a2..3da8d3d8925cd7a111c0c357bceecfd3a801c8eb 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -292,7 +292,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
@@ -303,7 +303,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
WORLD_BORDER,
/**
* Damage caused when an entity contacts a block such as a Cactus,