Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02: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@de04cbc Updated Upstream (Bukkit/CraftBukkit) (#10034)
This commit is contained in:
granny
2023-12-17 01:11:46 -08:00
parent 9e1216de50
commit eb3b67d5b2
30 changed files with 100 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0171-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 f12ad902b6add41ffd9aff19081ce4abf998effb..1ed6072672d0585fa7609b9709b7c4b876a0f7fe 100644
index f8851857bdaeb1173124f43ee0eb3bd845789467..942359c28d9ced02b737b712f4e83e844424afc0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -496,6 +496,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -353,10 +353,10 @@ 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 669405e0a38adc5336aa004011544346c44bc5bc..03b38dd69cd6932c17b9b2d832e67c14628a4918 100644
index fb80b7e2edebf915a98ef608d5b2e27a6c9ae79c..1ac0f0faab8d6a22429f16ea745640bba65ef4ab 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -228,6 +228,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -83,6 +83,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entityType = CraftEntityType.minecraftToBukkit(entity.getType());
}
@@ -365,14 +365,14 @@ index 669405e0a38adc5336aa004011544346c44bc5bc..03b38dd69cd6932c17b9b2d832e67c14
+ return getHandle().isSunBurnTick();
+ }
+
public static CraftEntity getEntity(CraftServer server, Entity entity) {
/*
* Order is *EXTREMELY* important -- keep it right! =D
public static <T extends Entity> CraftEntity getEntity(CraftServer server, T entity) {
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 93d8f8495a043efdbc763e1a35fd0ed86da5120e..ea91da46779b177d3457e4683a76cedea8bc684d 100644
index c5d245649ce3b609f3de360dc9569af410a1de80..741207b28a57a92d12d02ce3179eb50482ef0c43 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1137,5 +1137,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1136,5 +1136,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}