Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@e16fefb [ci skip] add 'accepted' to Done project category (#9429)
PaperMC/Paper@171ba7c Move Log4j plugins to own source set (#9428)
PaperMC/Paper@4356758 Call missing BlockDispenseEvents (#8518)
PaperMC/Paper@c0936a7 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
PaperMC/Paper@12c9700 Fix ThrownEggHatchEvent#setHatching (#9448)
This commit is contained in:
granny
2023-07-05 20:32:26 -07:00
parent ab2f1c06ce
commit b21daa9622
105 changed files with 679 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0177-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 53eebe175f4787f5fb88dda11b4d301824d6aa70..9d0e7b1982acb5bb48cfc5b804bcc4cc4ac93fd8 100644
index aab99783b9fd6c181f30b2672d5957438a1fc620..61dd24478dc1f955a3c67e81858aa7cec023b4de 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -496,6 +496,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -32,10 +32,10 @@ index 53eebe175f4787f5fb88dda11b4d301824d6aa70..9d0e7b1982acb5bb48cfc5b804bcc4cc
return this.hardCollides;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3cfa9cad7d59a6542ef64dcc0f3fbec346ab5b90..65e543bb44d94bcaa4abaa3272fb7f3e9b35fea8 100644
index cdae47c490555efad0eb2d2ae6498888aeaf21bd..972c0e43e3f099706b9ee744551d43d31ffb3fa7 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 implements Attackable {
@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
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
@@ -43,7 +43,7 @@ index 3cfa9cad7d59a6542ef64dcc0f3fbec346ab5b90..65e543bb44d94bcaa4abaa3272fb7f3e
@Override
public float getBukkitYaw() {
@@ -805,6 +806,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -804,6 +805,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
dataresult.resultOrPartial(logger::error).ifPresent((nbtbase) -> {
nbt.put("Brain", nbtbase);
});
@@ -51,7 +51,7 @@ index 3cfa9cad7d59a6542ef64dcc0f3fbec346ab5b90..65e543bb44d94bcaa4abaa3272fb7f3e
}
@Override
@@ -889,6 +891,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -888,6 +890,11 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.brain = this.makeBrain(new Dynamic(NbtOps.INSTANCE, nbt.get("Brain")));
}
@@ -63,7 +63,7 @@ index 3cfa9cad7d59a6542ef64dcc0f3fbec346ab5b90..65e543bb44d94bcaa4abaa3272fb7f3e
}
// CraftBukkit start
@@ -3547,6 +3554,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3537,6 +3544,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}
@@ -369,10 +369,10 @@ index 98f7d917f8377927472414bee79d2de4269ec0bc..1445f52031104baf81e2b5373a400a58
/*
* 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 a26a622a4782b2f1227ffac215561c86e6c1b0cb..f4ab4d016a467dbd3232726a3ab500be083d4747 100644
index 3e261a1617ff9e0d2f4745769f819292d19200c4..bbf741ab97d43eaa0eade0e2f1edc7c6adc83636 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1089,5 +1089,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1116,5 +1116,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}