Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@6bb9dc6b Normalize and trim spaces in Player#performCommand (#12892)
PaperMC/Paper@840dd9e1 Fix dialog preconditions (#12895)
PaperMC/Paper@9ccc51df Fix legacy pearls forgetting owner on disconnect (#12884)
PaperMC/Paper@57c13137 Allow to change despawnInPeaceful (#12880)
PaperMC/Paper@a5763618  Add WorldDifficultyChangeEvent (#12471)
PaperMC/Paper@dbc367ba Keep non-container slots synced when in container view (#12881)
This commit is contained in:
granny
2025-07-28 16:39:42 -07:00
parent 6c88d74021
commit 520a7e500d
14 changed files with 97 additions and 95 deletions

View File

@@ -1,14 +1,14 @@
--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
@@ -139,6 +_,7 @@
private BlockPos homePosition = BlockPos.ZERO;
@@ -140,6 +_,7 @@
private int homeRadius = -1;
public boolean aware = true; // CraftBukkit
public net.kyori.adventure.util.TriState despawnInPeacefulOverride = net.kyori.adventure.util.TriState.NOT_SET; // Paper - allow changing despawnInPeaceful
+ public int ticksSinceLastInteraction; // Purpur - Entity lifespan
protected Mob(EntityType<? extends Mob> entityType, Level level) {
super(entityType, level);
@@ -284,6 +_,7 @@
@@ -285,6 +_,7 @@
target = null;
}
}
@@ -16,7 +16,7 @@
this.target = target;
return true;
// CraftBukkit end
@@ -327,7 +_,27 @@
@@ -328,7 +_,27 @@
}
profilerFiller.pop();
@@ -45,23 +45,23 @@
@Override
protected void playHurtSound(DamageSource source) {
@@ -427,6 +_,7 @@
output.putBoolean("NoAI", this.isNoAi());
@@ -433,6 +_,7 @@
output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name());
}
output.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
// Paper end - allow changing despawnInPeaceful
+ output.putInt("Purpur.ticksSinceLastInteraction", this.ticksSinceLastInteraction); // Purpur - Entity lifespan
}
@Override
@@ -454,6 +_,7 @@
this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L);
@@ -461,6 +_,7 @@
this.setNoAi(input.getBooleanOr("NoAI", false));
this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit
this.despawnInPeacefulOverride = input.read("Paper.DespawnInPeacefulOverride", io.papermc.paper.util.PaperCodecs.TRI_STATE_CODEC).orElse(net.kyori.adventure.util.TriState.NOT_SET); // Paper - allow changing despawnInPeaceful
+ this.ticksSinceLastInteraction = input.getIntOr("Purpur.ticksSinceLastInteraction", 0); // Purpur- Entity lifespan
}
@Override
@@ -1188,7 +_,7 @@
@@ -1201,7 +_,7 @@
);
}
@@ -70,7 +70,7 @@
return spawnGroupData;
}
@@ -1525,6 +_,7 @@
@@ -1538,6 +_,7 @@
this.playAttackSound();
}