Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@9c45038 Return null in getRegistry(Class) for unknown type (#11422)
PaperMC/Paper@d611754 Disable pretty printing for advancement saving (#11419)
PaperMC/Paper@5bcb2ff Correctly launch WindCharges (#11418)
PaperMC/Paper@593faf4 Create TileStateInventoryHolder (#11420)
PaperMC/Paper@1ed64f8 Update launchProjectile API (#11300)
  • Loading branch information
granny committed Sep 22, 2024
1 parent be61a07 commit f154903
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.1-R0.1-SNAPSHOT

mcVersion = 1.21.1
paperCommit = c5a10665b8b80af650500b9263036f778f06d500
paperCommit = 1ed64f82704c299d0f7ae9af710579be995af8de

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0169-API-for-any-mob-to-burn-daylight.patch
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,10 @@ index 0d497b26eeb53ca65bbb936e2c1bed3d47560ea2..33469665998543f45e68eb50e7dc3f3c
Preconditions.checkArgument(entity != null, "Unknown entity");

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index a46fbd2a5e31dd9aa7fcf0867c91ec8d28990861..4ce0afdd922ad52b9f2f50ec1091192f9801f33a 100644
index 4750df7354ccb5afd0910efe0415f3a2eb19a546..0a3da3d35cd6b41003692d968b77384e7460ca97 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1168,4 +1168,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1192,4 +1192,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return this.getHandle().canUseSlot(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}
// Paper end - Expose canUseSlot
Expand Down

0 comments on commit f154903

Please sign in to comment.