Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47: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@b14979e Remove isRemoved skip on .discard() (#9520)
PaperMC/Paper@1837f6c Prevent entity removals if the entity slices is receiving status updates
PaperMC/Paper@a40e48f Add cause to PlayerOpenSignEvent (#9441)
This commit is contained in:
granny
2023-07-26 12:43:35 -07:00
parent 7cefa0cafa
commit 9dab7fe5f1
14 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0290-Fire-Immunity-API.patch
View File

@@ -5,7 +5,7 @@ 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 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1cbe6591c 100644
index 2680aeabddc2dabc2c92e187149a567a842cada1..146612fc235f4879123c73b59b1a15ef45c5d5dc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -16,7 +16,7 @@ index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -1821,7 +1822,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1820,7 +1821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean fireImmune() {
@@ -25,7 +25,7 @@ index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2491,6 +2492,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2490,6 +2491,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -37,7 +37,7 @@ index 5cded930e23e881b2e02ed2456b1d7147fa63777..a406740705fae2d50eb7ed55cadc4bd1
return nbt;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2659,6 +2665,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2658,6 +2664,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end