Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-30 20:39:21 +00:00
Code Issues Releases Activity

Updated Upstream (Gale & Purpur)

Browse Source
This commit is contained in:
Dreeam
2023-07-05 18:02:34 +08:00
parent 4849c1bcb1
commit 8b4745d4a3
24 changed files with 940 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0026-Leaves-Server-Utils.patch
View File

@@ -33,10 +33,10 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
public PlayerAreaMap() {
super();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8c1cf9f56a13cae026a18d14b8ac3b884f7d86ca..33820dff0751a84d9bc630c29847382aadb88af9 100644
index ef7b46d80dbb9f80a2c199796e2e1f596f181145..18b9a7fe41cffb9ef7e060701621fd4b8726fcfd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -408,6 +408,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -420,6 +420,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean collidingWithWorldBorder; // Paper
public @Nullable Boolean immuneToFire = null; // Purpur - Fire immune API
@@ -44,7 +44,7 @@ index 8c1cf9f56a13cae026a18d14b8ac3b884f7d86ca..33820dff0751a84d9bc630c29847382a
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -2523,6 +2524,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2537,6 +2538,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Purpur.FireImmune", immuneToFire);
}
// Purpur end
@@ -52,7 +52,7 @@ index 8c1cf9f56a13cae026a18d14b8ac3b884f7d86ca..33820dff0751a84d9bc630c29847382a
return nbt;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2696,6 +2698,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2710,6 +2712,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
immuneToFire = nbt.getBoolean("Purpur.FireImmune");
}
// Purpur end
@@ -64,7 +64,7 @@ index 8c1cf9f56a13cae026a18d14b8ac3b884f7d86ca..33820dff0751a84d9bc630c29847382a
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -5025,4 +5032,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -5039,4 +5046,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return false;
}
// Purpur end