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@77c763b Fix PlayerShearBlockEvent drops ignored for Pumpkin (#10956)
PaperMC/Paper@76c2f16 Fix wrong diff applying delta twice (#10959)
This commit is contained in:
granny
2024-06-22 19:19:32 -07:00
parent 21ec259c5d
commit 9efd5fcda1
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0267-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 99c01f0328fab0a71a888dd57c74e9771e9e6bb8..9d44ca469e658005b5379eb07c483fc4983b3273 100644
index 541fbd5b90cc6a2dd98733bc90602256d2ef59ed..58afe42685536bed08b24ddcf11404b5a4d6c7cd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -430,6 +430,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -25,7 +25,7 @@ index 99c01f0328fab0a71a888dd57c74e9771e9e6bb8..9d44ca469e658005b5379eb07c483fc4
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2475,6 +2476,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2474,6 +2475,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
nbttagcompound.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -37,7 +37,7 @@ index 99c01f0328fab0a71a888dd57c74e9771e9e6bb8..9d44ca469e658005b5379eb07c483fc4
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2622,6 +2628,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -2621,6 +2627,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end