Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@55a16d8 Fix Varint21FrameDecoder cached length buf usage
PaperMC/Paper@e6e37ba Add api to resolve components (#7648)
PaperMC/Paper@7168438 [ci skip] Rework workflows to support optional paperclip build (#8583)
PaperMC/Paper@da230d5 More vanilla friendly methods to update trades (#8478)
PaperMC/Paper@8aff07a Add /paper dumplisteners command (#8507)
PaperMC/Paper@b8919a7 pr command action fixes (#8591)
PaperMC/Paper@185fa48 Fix chest relooting mechanics (#8580)
PaperMC/Paper@b4beac0 Fixes potential issues arising from optimizing getPlayerByUUID (#8585)
PaperMC/Paper@f637b1a Fix async entity add due to fungus trees (#7626)
PaperMC/Paper@414ea80 ItemStack damage API (#7801)
PaperMC/Paper@d98c370 Add displayName methods for advancements (#8584)
PaperMC/Paper@44bb599 Add Tick TemporalUnit (#5445)
PaperMC/Paper@9f7eef8 Friction API (#6611)
PaperMC/Paper@4048d3e Allow using degrees for ArmorStand rotations (#7847)
PaperMC/Paper@f59c802 Schoolable Fish API (#7089)
PaperMC/Paper@21b964a Added ability to control player's insomnia and phantoms spawning (#6500)
PaperMC/Paper@f1583fc Add `/paper dumplisteners tofile` and increase detail of command output (#8592)
This commit is contained in:
BillyGalbreath
2022-11-26 18:48:36 -06:00
parent a8b26671d1
commit 47dc2e92f5
90 changed files with 546 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0182-API-for-any-mob-to-burn-daylight.patch
View File

@@ -31,18 +31,18 @@ index a3a76273bb6ce1621366cfd8dec22e5bd3f5c45e..bd76451230bb0b5abb744088b67b7e55
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 324ad2c199f2df99248785321e3127a4685a839b..13b912df3d653b8c74e5e9f4bc73790316a2b5c8 100644
index 5fd0ec5cff82bff9f44d03dc4d979eabe4c507e2..6c506c32814b9e068b92094aab54be7647178c89 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity {
public boolean bukkitPickUpLoot;
@@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity {
public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
+ protected boolean shouldBurnInDay = false; public boolean shouldBurnInDay() { return this.shouldBurnInDay; } public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; } // Purpur
@Override
public float getBukkitYaw() {
@@ -787,6 +788,7 @@ public abstract class LivingEntity extends Entity {
@@ -793,6 +794,7 @@ public abstract class LivingEntity extends Entity {
dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> {
nbt.put("Brain", nbtbase);
});
@@ -50,7 +50,7 @@ index 324ad2c199f2df99248785321e3127a4685a839b..13b912df3d653b8c74e5e9f4bc737903
}
@Override
@@ -862,6 +864,11 @@ public abstract class LivingEntity extends Entity {
@@ -877,6 +879,11 @@ public abstract class LivingEntity extends Entity {
this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
}
@@ -62,7 +62,7 @@ index 324ad2c199f2df99248785321e3127a4685a839b..13b912df3d653b8c74e5e9f4bc737903
}
// CraftBukkit start
@@ -3496,6 +3503,27 @@ public abstract class LivingEntity extends Entity {
@@ -3511,6 +3518,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -351,7 +351,7 @@ index 0eaa8119201cae52340a1a58700906eb96e2a99f..f9e6f1788ae5e02372140a40373b4dec
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index fbddb90fdbaa99c5f243b6e93c55fc1f7430e337..403085673b87291799538f4f3aad2dfe65b35660 100644
index edfd2d9450805f05df607b5160a0c0ecf9170915..e08cbcb9230889cc86b0726d67038e1cf9914c87 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -205,6 +205,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -367,10 +367,10 @@ index fbddb90fdbaa99c5f243b6e93c55fc1f7430e337..403085673b87291799538f4f3aad2dfe
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index aec6f37ceac8ba9a987edf3eb24bbc06d3b1613a..f2d17cb06fbcd7370ab8465c5c4830f8ba31169a 100644
index bea0a1441b3f331e1bbaee15a91b279950bca640..32d4960fbee976004d5d1a3a5c29c2e963a8d577 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1001,5 +1001,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1060,5 +1060,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}