Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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@ea0b639 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
PaperMC/Paper@2eda177 Expand PlayerItemMendEvent (#7382)
PaperMC/Paper@bacbf86 Fixes and additions to projectile API (#9237)
PaperMC/Paper@8a18fc5 [ci skip] add 'needs triage' label to invalid on issue close (#9252)
PaperMC/Paper@d8d3bd7 [ci skip] Add missing deprecations for legacy MaterialData api (#9253)
This commit is contained in:
granny
2023-06-04 00:18:33 -07:00
parent d6cfa8f939
commit 6d7bb23341
37 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ 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 def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b377930f69174e 100644
index 889db414e3442f51f77be097806e52b4941362d5..3e2e2965270090cb2cf12b6c62cc13d3743e0604 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -400,6 +400,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -401,6 +401,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
private UUID originWorld;
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean collidingWithWorldBorder; // Paper
@@ -16,7 +16,7 @@ index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b37793
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -1677,7 +1678,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1678,7 +1679,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean fireImmune() {
@@ -25,7 +25,7 @@ index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b37793
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2339,6 +2340,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2340,6 +2341,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -37,7 +37,7 @@ index def4a9fd76b99f4f30fc2f9551cb6b283035cc88..d18304939e062453cf8ca7d6c1b37793
return nbt;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2507,6 +2513,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2508,6 +2514,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end