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@ff26d54 send sound and particle packets immediately even if off main (#10033)
PaperMC/Paper@e3140fb hotfix spawning item/xp in wrong spot
PaperMC/Paper@0b95298 Make worldborder collisions consistent with Vanilla
This commit is contained in:
granny
2023-12-18 18:30:41 -08:00
parent eb3b67d5b2
commit cfd98b844d
16 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0282-Fire-Immunity-API.patch
View File

@@ -5,18 +5,18 @@ Subject: [PATCH] Fire Immunity API
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 381ca3207b4d7b7ca3b30e0ba2d0834dd69d1d0e..51f83ee4f617c0dbe40ef9fa1d2f5e49e68e37bb 100644
index b45064a92674a4c48350c466b8131bf1ffae4335..1e2308ecde7bef57ac0b6192b8362cbcd58e6725 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -423,6 +423,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
private UUID originWorld;
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean collidingWithWorldBorder; // Paper
public boolean fixedPose = false; // Paper
+ public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -1805,7 +1806,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1800,7 +1801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
public boolean fireImmune() {
@@ -25,7 +25,7 @@ index 381ca3207b4d7b7ca3b30e0ba2d0834dd69d1d0e..51f83ee4f617c0dbe40ef9fa1d2f5e49
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2497,6 +2498,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2492,6 +2493,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
nbttagcompound.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -37,7 +37,7 @@ index 381ca3207b4d7b7ca3b30e0ba2d0834dd69d1d0e..51f83ee4f617c0dbe40ef9fa1d2f5e49
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2644,6 +2650,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2639,6 +2645,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end