PaperMC/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2026-10-12 02:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add back mob peaceful despawn override

Browse Source
This commit is contained in:
Nassim Jahnke
2026-09-26 15:09:58 +02:00
parent d289ae1dfc
commit a091961346
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paper-api/src/main/java/org/bukkit/entity/Mob.java
-4
View File
@@ -33,9 +33,7 @@ public interface Mob extends LivingEntity, Lootable, Leashable {
* </ul>
*
* @param state a TriState representing the state of the override
* @deprecated the client no longer allows to change that setting and will not render the entity
*/
@Deprecated(since = "26.2")
void setDespawnInPeacefulOverride(TriState state);
/**
@@ -48,9 +46,7 @@ public interface Mob extends LivingEntity, Lootable, Leashable {
*
* @return a TriState representing the state of the override
* @see Mob#setDespawnInPeacefulOverride(TriState)
* @deprecated the client no longer allows to change that setting and will not render the entity
*/
@Deprecated(since = "26.2")
TriState getDespawnInPeacefulOverride();
@Override
paper-server/patches/features/0004-Entity-Activation-Range-2.0.patch
+3 -3
View File
@@ -355,7 +355,7 @@ index 0000000000000000000000000000000000000000..829f7685904fd741e00403647ae76d32
+ }
+}
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index a20c7ed74a54c08b43fdf778fbf6eab4293ea0c6..7fa69d76bf2c802b538a21af40898b8abb79629e 100644
index 46e7478bd96e42487cf0fc467b6b9b83f2887d10..bc2bacabb588bd6a644ac5226720c7451ac0e475 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -887,6 +887,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ServerEntityGet
@@ -541,10 +541,10 @@ index afbf91722c5f0d0d3d1d075d544feaf0aa187fe2..f332edbc4dad82cbdc02a58aa9ec21fa
public void tick() {
super.tick();
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
index 1dcdb4788d23df187e6ae7c17629507739ae0d95..648826138efdc48487c78133893394c9e4908d3f 100644
index e1a0eab8bfdda1b68bcb2db0e5c21d6e94d1fd0c..078054c499e7b29d64543f92c1808b5623e3c8e5 100644
--- a/net/minecraft/world/entity/Mob.java
+++ b/net/minecraft/world/entity/Mob.java
@@ -216,6 +216,20 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
@@ -217,6 +217,20 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
return this.lookControl;
}
paper-server/patches/sources/net/minecraft/world/entity/Mob.java.patch
+14 -5
View File
@@ -23,11 +23,12 @@
public GoalSelector targetSelector;
private @Nullable LivingEntity target;
private final Sensing sensing;
@@ -145,6 +_,7 @@
@@ -145,6 +_,8 @@
private Leashable.@Nullable LeashData leashData;
private BlockPos homePosition = BlockPos.ZERO;
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
protected Mob(final EntityType<? extends Mob> type, final Level level) {
super(type, level);
@@ -77,11 +78,16 @@
}
@Override
@@ -389,13 +_,22 @@
@@ -389,13 +_,27 @@
if (this.isNoAi()) {
output.putBoolean("NoAI", this.isNoAi());
}
+ output.putBoolean("Bukkit.Aware", this.aware); // CraftBukkit
+ // Paper start - allow changing despawnInPeaceful
+ if (this.despawnInPeacefulOverride != net.kyori.adventure.util.TriState.NOT_SET) {
+ output.putString("Paper.DespawnInPeacefulOverride", this.despawnInPeacefulOverride.name());
+ }
+ // Paper end - allow changing despawnInPeaceful
}
@Override
@@ -102,11 +108,12 @@
this.dropChances = input.read("drop_chances", DropChances.CODEC).orElse(DropChances.DEFAULT);
this.readLeashData(input);
this.homeRadius = input.getIntOr("home_radius", -1);
@@ -407,12 +_,13 @@
@@ -407,12 +_,14 @@
this.lootTable = input.read("DeathLootTable", LootTable.KEY_CODEC);
this.lootTableSeed = input.getLongOr("DeathLootTableSeed", 0L);
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
}
@Override
@@ -172,11 +179,13 @@
double dropChance = this.dropChances.byEquipment(slot);
if (!current.isEmpty() && Math.max(this.random.nextFloat() - 0.1F, 0.0F) < dropChance) {
this.spawnAtLocation(level, current);
@@ -684,27 +_,33 @@
@@ -683,28 +_,34 @@
@Override
public void checkDespawn() {
if (this.level().getDifficulty() == Difficulty.PEACEFUL && !this.getType().isAllowedInPeaceful()) {
- if (this.level().getDifficulty() == Difficulty.PEACEFUL && !this.getType().isAllowedInPeaceful()) {
- this.discard();
+ if (this.level().getDifficulty() == Difficulty.PEACEFUL && this.despawnInPeacefulOverride.toBooleanOrElse(!this.getType().isAllowedInPeaceful())) { // Paper - allow changing despawnInPeaceful
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
} else {
boolean isPersistent = this.isPersistenceRequired() || this.requiresCustomPersistence();
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
+3 -1
View File
@@ -41,11 +41,13 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob, io.pape
@Override
public void setDespawnInPeacefulOverride(final TriState state) {
Preconditions.checkArgument(state != null, "TriState cannot be null");
this.getHandle().despawnInPeacefulOverride = state;
}
@Override
public TriState getDespawnInPeacefulOverride() {
return TriState.NOT_SET;
return this.getHandle().despawnInPeacefulOverride;
}
@Override
snapshot-todos.txt
-3
View File
@@ -3,6 +3,3 @@
- ReloadableServerRegistries - this logic all appears to have moved downstream and handled by somebody else, somebody with more familiarity with the code should check this
- BrewingRecipe for now takes any RecipeChoice, which does not represent the PotionIngredient fully.
- Run test for brigadier command suggestions for checking the last changes related to the context used
- All of cook speed multiplier is yanked *for now* but technically would be implementable just fine and might want to make a comeback
- ServerboundAcceptTeleportationPacket now triggers the entire move logic flow. This will call events etc....
- undeprecate setDespawnInPeacefulOverride? the client allow these entities again