Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@921c5f93 Do not send update packets for saddle/body slots
PaperMC/Paper@f00d9bce Second part of diff
PaperMC/Paper@24cd24c8 Optimise CraftWorld#getLoadedChunks
PaperMC/Paper@73c536da add new UI sound category
PaperMC/Paper@a8df9346 Run generators
PaperMC/Paper@77d1c233 Remove useless comments and FQN in source
PaperMC/Paper@26a82545 fix some NPEs
PaperMC/Paper@774c40e7 Update CraftWorld#getForceLoadedChunks to avoid using getChunkAt
This commit is contained in:
granny
2025-06-05 19:50:36 -07:00
parent 2a261de395
commit e40ada42af
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.6-R0.1-SNAPSHOT version = 1.21.6-R0.1-SNAPSHOT
mcVersion = 1.21.6-pre3 mcVersion = 1.21.6-pre3
paperCommit = f8bde6e1d0d303188572c5e6785b92dbbc07c218 paperCommit = 774c40e71297c6e6d7d417639e1ce61cc79cc5ba
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

2
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
View File

@@ -106,7 +106,7 @@
+ if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur - Allow leashing villagers + if (hand == InteractionHand.OFF_HAND && (level().purpurConfig.villagerCanBeLeashed || level().purpurConfig.wanderingTraderCanBeLeashed) && this instanceof net.minecraft.world.entity.npc.AbstractVillager) return InteractionResult.CONSUME; // Purpur - Allow leashing villagers
// Paper start - EntityUnleashEvent // Paper start - EntityUnleashEvent
if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent( if (!org.bukkit.craftbukkit.event.CraftEventFactory.handlePlayerUnleashEntityEvent(
leashable2, player, hand, !player.hasInfiniteMaterials() leashable2, player, hand, !player.hasInfiniteMaterials(), true
@@ -3389,15 +_,18 @@ @@ -3389,15 +_,18 @@
return Vec3.directionFromRotation(this.getRotationVector()); return Vec3.directionFromRotation(this.getRotationVector());
} }

2
purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch
View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2352,6 +_,50 @@ @@ -2370,6 +_,50 @@
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
} }