Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27: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@eda3d53 [ci skip] Improve PlayerChatEvent Deprecation Message (#9956)
PaperMC/Paper@e1cd9e5 Update paperweight to 1.5.10 and Gradle to 8.4 (#9957)
PaperMC/Paper@96d5e6c Code Generation for TypedKeys (#9233)
PaperMC/Paper@ed753d3 Re-add missing vanilla safeMode arg
PaperMC/Paper@334b2f2 Fix max nearby entities class check (#9967)
PaperMC/Paper@faa2f47 Lazily create LootContext for criterions (#9969)
PaperMC/Paper@8280211 Fix yaw being ignored for first spawn pos (#9959)
PaperMC/Paper@8eac3e1 Don't fire EntityPotionEffectEvent during worldgen (#9965)
PaperMC/Paper@0b20f94 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9953)
PaperMC/Paper@f9938d3 Fix plugin bootstrap dependency tree population (#9963)
PaperMC/Paper@b37bbcf Use ? super in Consumer/Predicate API (#9939)
This commit is contained in:
granny
2023-11-26 22:27:27 -08:00
parent 4b1a082c94
commit c46cb7ef66
35 changed files with 122 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0174-API-for-any-mob-to-burn-daylight.patch
View File

@@ -32,7 +32,7 @@ index d16d15c92456ce2d8bb287a0c668b7bc459c5066..0aa3c178d0bca9332702589b5f078101
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 011914bdbf602fa5696d24d11e3207a9bc6a9ef2..d36b2343cb94d59a8e4fea0d8608a6973116d641 100644
index 0ea17c4f6ad4753b6ed02b2387c1d3762c8d67d0..a75f8b72632cab7b9f2c5c6e0cacebe8fe572691 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -63,7 +63,7 @@ index 011914bdbf602fa5696d24d11e3207a9bc6a9ef2..d36b2343cb94d59a8e4fea0d8608a697
}
// CraftBukkit start
@@ -3574,6 +3581,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3582,6 +3589,27 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().drown(), 1.0F);
}
@@ -353,7 +353,7 @@ index e118cfc34b05f6d4921a0903eca70be6b68bff4f..fab8e4ffa083e3d436fd4d6d19cf8ea8
// 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 ac31a117428875143871cb807088250dce4f780a..8d5669917e66c16a5653dc0bca1db2618801c8f1 100644
index b636553c33b8a09c9d92ff8f355affe05e1579cf..7ca35289068dbece3f9f19384fe202fc844eceea 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -223,6 +223,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -369,7 +369,7 @@ index ac31a117428875143871cb807088250dce4f780a..8d5669917e66c16a5653dc0bca1db261
/*
* 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 06c4647593334842217549e3266d4d6c9da81365..d085ba1f8019ee901c2e47ff46cd295ae6766f84 100644
index 4ab5cbdbdb78215f738380873dc710467ac2e52b..a7c81e76b0e6cd50c3900f7aa07807a74b13f606 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1132,5 +1132,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {