SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-6663: Chicken Jockeys chickens don't despawn

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-07-22 09:53:26 +10:00
parent bfc74e8628
commit 2ccd460e09
10 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@@ -491,13 +491,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public boolean getRemoveWhenFarAway() {
return getHandle() instanceof EntityInsentient && !((EntityInsentient) getHandle()).persistenceRequired;
return getHandle() instanceof EntityInsentient && !((EntityInsentient) getHandle()).isPersistent();
}
@Override
public void setRemoveWhenFarAway(boolean remove) {
if (getHandle() instanceof EntityInsentient) {
((EntityInsentient) getHandle()).persistenceRequired = !remove;
((EntityInsentient) getHandle()).setPersistenceRequired(!remove);
}
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftVillagerZombie.java
View File

@@ -76,7 +76,7 @@ public class CraftVillagerZombie extends CraftZombie implements ZombieVillager {
if (time < 0) {
getHandle().villagerConversionTime = -1;
getHandle().getDataWatcher().set(EntityZombieVillager.DATA_CONVERTING_ID, false);
getHandle().persistenceRequired = false; // CraftBukkit - SPIGOT-4684 update persistence
getHandle().setPersistenceRequired(false); // CraftBukkit - SPIGOT-4684 update persistence
getHandle().conversionStarter = null;
getHandle().removeEffect(MobEffects.DAMAGE_BOOST, org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONVERSION);
} else {

2
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@@ -661,7 +661,7 @@ public class CraftEventFactory {
org.bukkit.entity.AnimalTamer bukkitTamer = (tamer != null ? tamer.getBukkitEntity() : null);
CraftServer craftServer = (CraftServer) bukkitEntity.getServer();
entity.persistenceRequired = true;
entity.setPersistenceRequired(true);
EntityTameEvent event = new EntityTameEvent((LivingEntity) bukkitEntity, bukkitTamer);
craftServer.getPluginManager().callEvent(event);