Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-22 03:08:16 +02: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@5027a22c fix test
PaperMC/Paper@7b1b5f66 applyOrMoveSourcePatches for pre-2
PaperMC/Paper@743ab685 set updatingMinecraft flag
PaperMC/Paper@17d72ad2 26.1-rc-1
PaperMC/Paper@42c355e0 update to rc2
PaperMC/Paper@890e3cd4 fix setPlayerTime's rate, call TimeSkipEvent for time set <markerId>
PaperMC/Paper@8077ce40 cleanup PlayerInteractEvent
PaperMC/Paper@5f86e092 Start porting feature patches
PaperMC/Paper@5ba0e30a More feature patches
PaperMC/Paper@1abe8fe5 Apply redstone patches
PaperMC/Paper@3dfcd069 Simplify CraftStructureManager#loadStructure
PaperMC/Paper@392f8bf3 26.1-rc-3
This commit is contained in:
granny
2026-03-23 17:21:13 -07:00
parent 2df686555d
commit 9d93fc17bd
28 changed files with 140 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
View File

@@ -206,7 +206,7 @@
private boolean shouldCheckPlayerMovement(final boolean isFallFlying) {
if (this.isSingleplayerOwner()) {
return false;
@@ -2155,6 +_,7 @@
@@ -2150,6 +_,7 @@
boolean cancelled;
if (hitResult == null || hitResult.getType() != HitResult.Type.BLOCK) {
@@ -214,15 +214,15 @@
org.bukkit.event.player.PlayerInteractEvent event = CraftEventFactory.callPlayerInteractEvent(this.player, Action.RIGHT_CLICK_AIR, itemStack, hand);
cancelled = event.useItemInHand() == Event.Result.DENY;
} else {
@@ -2800,6 +_,7 @@
if (target != null && level.getWorldBorder().isWithinBounds(target.blockPosition())) {
AABB targetBounds = target.getBoundingBox();
if (this.player.isWithinAttackRange(this.player.getMainHandItem(), targetBounds, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience value for interact range
+ if (target instanceof net.minecraft.world.entity.Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur - Entity lifespan
if (!(target instanceof ItemEntity)
&& !(target instanceof ExperienceOrb)
&& (target != this.player || this.player.isSpectator()) // CraftBukkit
@@ -3590,7 +_,7 @@
@@ -2791,6 +_,7 @@
ItemStack mainHandItem = this.player.getMainHandItem();
if (this.player.isWithinAttackRange(mainHandItem, targetBounds, io.papermc.paper.configuration.GlobalConfiguration.get().misc.clientInteractionLeniencyDistance.or(3.0))) { // Paper - configurable lenience
if (!mainHandItem.has(DataComponents.PIERCING_WEAPON)) {
+ if (target instanceof net.minecraft.world.entity.Mob mob) mob.ticksSinceLastInteraction = 0; // Purpur - Entity lifespan
if (target instanceof ItemEntity
|| target instanceof ExperienceOrb
|| target == this.player
@@ -3572,7 +_,7 @@
@Override
public void handleChangeGameMode(final ServerboundChangeGameModePacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.level());

2
purpur-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -284,7 +_,7 @@
@@ -282,7 +_,7 @@
ServerLoginPacketListenerImpl.LOGGER.warn("Failed to verify username but will let them in anyway!");
ServerLoginPacketListenerImpl.this.startClientVerification(ServerLoginPacketListenerImpl.this.createOfflineProfile(name)); // Spigot
} else {