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@93829bb Account for dimension type in portal void damage check (#9602)
PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)
This commit is contained in:
granny
2023-08-13 22:51:10 -07:00
parent 1846bae1b6
commit aeecb71060
20 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0289-Fire-Immunity-API.patch
View File

@@ -50,11 +50,11 @@ index 15f6e27c5c87532ab41e0808a7bbed56569ba93b..f03a919020958659b48fd0f13dc4672b
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1445f52031104baf81e2b5373a400a588535b29d..edd9fb7154d1082b3fe6d7b6e470f4f4c5459e4b 100644
index eedd41c86e54eb3e6e497c9ad47d6b003bd69f1b..2381360aa8543fefdc7f205a199799f177840c3d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -218,6 +218,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity;
@@ -224,6 +224,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entityType = (type != null) ? type : EntityType.UNKNOWN;
}
+ @Override
@@ -71,10 +71,10 @@ index 1445f52031104baf81e2b5373a400a588535b29d..edd9fb7154d1082b3fe6d7b6e470f4f4
public boolean isInDaylight() {
return getHandle().isSunBurnTick();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
index 09001578b88658c44d0661d340a0ee0f1ded6911..ea15690da167ec5e653da6f5afb55b33c45d1622 100644
index 8fcee0e426cd598ddfd7e12df4382d57d2016780..4ffb4046b63cbc140c76721f51c9a7a09e81844d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
@@ -182,9 +182,14 @@ public class CraftItem extends CraftEntity implements Item {
@@ -176,9 +176,14 @@ public class CraftItem extends CraftEntity implements Item {
return item.immuneToExplosion;
}