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@c1ea550 Remove more outdated config settings (#9358)
PaperMC/Paper@3a03739 Add method to get ungenerated chunk from long key (#9254)
PaperMC/Paper@072b78a Add trail ruins structure set seed in spigot config (#9327)
PaperMC/Paper@faf9a65 Disable BukkitMirrorTest
PaperMC/Paper@873533b Add method to remove all active potion effects (#9361)
PaperMC/Paper@275173e Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@976b95c Temp: Pre-init PlayerChunkLoaderData in order to prepopulate the BFS lookup cache because potatos (Closes #9338)
PaperMC/Paper@d6d4c78 Move some Folia API to Paper for easy compat (#9360)
PaperMC/Paper@b1fe756 Revert "Move some Folia API to Paper for easy compat (#9360)"
PaperMC/Paper@1f5bec7 Pull Folia API take two
PaperMC/Paper@3756f5b Properly Cancel Usable Items (#9225)
This commit is contained in:
granny
2023-06-20 15:54:20 -07:00
parent fa3166a24d
commit 991719aa9e
52 changed files with 243 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0293-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 7648d6faf9ef9308c92bdbd481b6339ecf6ce85f..2ac097ce94c6e16e6283edd1dd3e6327820e4d68 100644
index 24d87e62d9722a553944b8d9199209c3688ae865..f7561986a7cd2f8b66834b9bb57db12d111b6556 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -405,6 +405,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -417,6 +417,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 7648d6faf9ef9308c92bdbd481b6339ecf6ce85f..2ac097ce94c6e16e6283edd1dd3e6327
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -1808,7 +1809,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1821,7 +1822,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean fireImmune() {
@@ -25,7 +25,7 @@ index 7648d6faf9ef9308c92bdbd481b6339ecf6ce85f..2ac097ce94c6e16e6283edd1dd3e6327
}
public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
@@ -2478,6 +2479,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2491,6 +2492,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
nbt.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -37,7 +37,7 @@ index 7648d6faf9ef9308c92bdbd481b6339ecf6ce85f..2ac097ce94c6e16e6283edd1dd3e6327
return nbt;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2646,6 +2652,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2659,6 +2665,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end
@@ -50,10 +50,10 @@ index 7648d6faf9ef9308c92bdbd481b6339ecf6ce85f..2ac097ce94c6e16e6283edd1dd3e6327
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 41089892e735eec7e3914084bbc278d67c4b6ea0..37739d0a58fa60f79462c577531d3e4b5e47b2ba 100644
index 1445f52031104baf81e2b5373a400a588535b29d..edd9fb7154d1082b3fe6d7b6e470f4f4c5459e4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -209,6 +209,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -218,6 +218,16 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
this.entity = entity;
}