Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-04-21 18:58: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@bbeaddeb Simplify diff in ProjectileWeaponItem
PaperMC/Paper@e63832e5 Re-add diff comment in Villager
PaperMC/Paper@63f9644a Simplify diff in ChunkMap
PaperMC/Paper@f2df3219 update EntityTargetLivingEntityEvent handling
PaperMC/Paper@e7ea5050 fix NPE after launching ender eye
PaperMC/Paper@267f7aef respect mobs-can-always-pick-up-loot for baby zombies
PaperMC/Paper@8ad1ef1d bunch of renames and fix NPE in getCraftingRemainingItem
This commit is contained in:
granny
2026-03-30 15:43:54 -07:00
parent c3bd0f73fc
commit d8f2ab289c
15 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/Mob.java.patch
View File

@@ -8,15 +8,15 @@
protected Mob(final EntityType<? extends Mob> type, final Level level) {
super(type, level);
@@ -298,6 +_,7 @@
@@ -303,6 +_,7 @@
target = null;
}
}
+ if (target instanceof net.minecraft.server.level.ServerPlayer) this.ticksSinceLastInteraction = 0; // Purpur - Entity lifespan
this.target = this.asValidTarget(target);
this.target = target;
return true;
// CraftBukkit end
@@ -341,7 +_,27 @@
@@ -346,7 +_,27 @@
}
profiler.pop();
@@ -45,7 +45,7 @@
@Override
protected void playHurtSound(final DamageSource source) {
@@ -445,6 +_,7 @@
@@ -450,6 +_,7 @@
output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name());
}
// Paper end - allow changing despawnInPeaceful
@@ -53,7 +53,7 @@
}
@Override
@@ -472,6 +_,7 @@
@@ -477,6 +_,7 @@
this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L);
this.setNoAi(input.getBooleanOr("NoAI", false));
this.aware = input.getBooleanOr("Bukkit.Aware", true); // CraftBukkit
@@ -61,7 +61,7 @@
// Paper start - allow changing despawnInPeaceful
this.despawnInPeacefulOverride = readDespawnInPeacefulOverride(input);
}
@@ -1250,7 +_,7 @@
@@ -1255,7 +_,7 @@
);
}
@@ -70,7 +70,7 @@
return groupData;
}
@@ -1607,6 +_,7 @@
@@ -1612,6 +_,7 @@
}
this.postPiercingAttack();

4
purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/goal/RunAroundLikeCrazyGoal.java.patch
View File

@@ -4,8 +4,8 @@
if (passenger instanceof Player player) {
int temper = this.horse.getTemper();
int maxTemper = this.horse.getMaxTemper();
- if (maxTemper > 0 && this.horse.getRandom().nextInt(maxTemper) < temper && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.horse, ((org.bukkit.craftbukkit.entity.CraftHumanEntity) this.horse.getBukkitEntity().getPassenger()).getHandle()).isCancelled()) { // CraftBukkit - fire EntityTameEvent
+ if (((this.horse.level().purpurConfig.alwaysTameInCreative && player.hasInfiniteMaterials()) || (maxTemper > 0 && this.horse.getRandom().nextInt(maxTemper) < temper)) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.horse, ((org.bukkit.craftbukkit.entity.CraftHumanEntity) this.horse.getBukkitEntity().getPassenger()).getHandle()).isCancelled()) { // CraftBukkit - fire EntityTameEvent // Purpur - Config to always tame in Creative
- if (maxTemper > 0 && this.horse.getRandom().nextInt(maxTemper) < temper && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.horse, player).isCancelled()) { // CraftBukkit - fire EntityTameEvent
+ if (((this.horse.level().purpurConfig.alwaysTameInCreative && player.hasInfiniteMaterials()) || (maxTemper > 0 && this.horse.getRandom().nextInt(maxTemper) < temper)) && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.horse, player).isCancelled()) { // CraftBukkit - fire EntityTameEvent // Purpur - Config to always tame in Creative
this.horse.tameWithName(player);
return;
}

2
purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/ChestBlock.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/ChestBlock.java
+++ b/net/minecraft/world/level/block/ChestBlock.java
@@ -380,6 +_,7 @@
@@ -352,6 +_,7 @@
}
public static boolean isBlockedChestByBlock(final BlockGetter level, final BlockPos pos) {