craftbukkit/nms-patches/net/minecraft/world/entity/animal/EntityAnimal.patch

105 lines
4.5 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/animal/EntityAnimal.java
+++ b/net/minecraft/world/entity/animal/EntityAnimal.java
2021-06-11 15:00:00 +10:00
@@ -28,11 +28,18 @@
import net.minecraft.world.level.gameevent.GameEvent;
2021-03-16 09:00:00 +11:00
import net.minecraft.world.level.pathfinder.PathType;
2021-03-09 08:47:33 +11:00
+// CraftBukkit start
2021-03-16 09:00:00 +11:00
+import net.minecraft.world.entity.EntityTameableAnimal;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityEnterLoveModeEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
public abstract class EntityAnimal extends EntityAgeable {
2019-06-21 20:00:00 +10:00
2021-06-11 15:00:00 +10:00
static final int PARENT_AGE_AFTER_BREEDING = 6000;
public int inLove;
public UUID loveCause;
2016-06-18 22:00:39 -07:00
+ public ItemStack breedItem; // CraftBukkit - Add breedItem variable
2019-04-23 12:00:00 +10:00
protected EntityAnimal(EntityTypes<? extends EntityAnimal> entitytypes, World world) {
2018-07-15 10:00:00 +10:00
super(entitytypes, world);
2021-06-11 15:00:00 +10:00
@@ -69,6 +76,9 @@
}
+ /* CraftBukkit start
+ // Function disabled as it has no special function anymore after
+ // setSitting is disabled.
2019-04-23 12:00:00 +10:00
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
2021-06-11 15:00:00 +10:00
@@ -78,6 +88,7 @@
return super.damageEntity(damagesource, f);
}
}
+ // CraftBukkit end */
2019-04-23 12:00:00 +10:00
@Override
2018-07-15 10:00:00 +10:00
public float a(BlockPosition blockposition, IWorldReader iworldreader) {
2021-06-11 15:00:00 +10:00
@@ -170,10 +181,17 @@
}
public void g(@Nullable EntityHuman entityhuman) {
2021-06-11 15:00:00 +10:00
- this.inLove = 600;
+ // CraftBukkit start
+ EntityEnterLoveModeEvent entityEnterLoveModeEvent = CraftEventFactory.callEntityEnterLoveModeEvent(entityhuman, this, 600);
+ if (entityEnterLoveModeEvent.isCancelled()) {
+ return;
+ }
2021-06-11 15:00:00 +10:00
+ this.inLove = entityEnterLoveModeEvent.getTicksInLove();
+ // CraftBukkit end
2017-05-14 12:00:00 +10:00
if (entityhuman != null) {
2021-06-11 15:00:00 +10:00
this.loveCause = entityhuman.getUniqueID();
2017-05-14 12:00:00 +10:00
}
2021-06-11 15:00:00 +10:00
+ this.breedItem = entityhuman.getInventory().getItemInHand(); // CraftBukkit
2017-05-14 12:00:00 +10:00
2021-06-11 15:00:00 +10:00
this.level.broadcastEntityEffect(this, (byte) 18);
2016-06-18 22:00:39 -07:00
}
2021-06-11 15:00:00 +10:00
@@ -213,11 +231,26 @@
2020-08-12 07:00:00 +10:00
EntityAgeable entityageable = this.createChild(worldserver, entityanimal);
2020-06-25 10:00:00 +10:00
if (entityageable != null) {
+ // CraftBukkit start - set persistence for tame animals
+ if (entityageable instanceof EntityTameableAnimal && ((EntityTameableAnimal) entityageable).isTamed()) {
+ entityageable.setPersistenceRequired(true);
2020-06-25 10:00:00 +10:00
+ }
+ // CraftBukkit end
EntityPlayer entityplayer = this.getBreedCause();
if (entityplayer == null && entityanimal.getBreedCause() != null) {
entityplayer = entityanimal.getBreedCause();
}
+ // CraftBukkit start - call EntityBreedEvent
+ entityageable.setBaby(true);
+ entityageable.setPositionRotation(this.locX(), this.locY(), this.locZ(), 0.0F, 0.0F);
2020-06-25 10:00:00 +10:00
+ int experience = this.getRandom().nextInt(7) + 1;
+ org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, entityanimal, entityplayer, this.breedItem, experience);
+ if (entityBreedEvent.isCancelled()) {
+ return;
+ }
+ experience = entityBreedEvent.getExperience();
+ // CraftBukkit end
if (entityplayer != null) {
entityplayer.a(StatisticList.ANIMALS_BRED);
2021-06-11 15:00:00 +10:00
@@ -228,12 +261,14 @@
entityanimal.setAgeRaw(6000);
this.resetLove();
2020-06-25 10:00:00 +10:00
entityanimal.resetLove();
- entityageable.setBaby(true);
- entityageable.setPositionRotation(this.locX(), this.locY(), this.locZ(), 0.0F, 0.0F);
2020-08-12 07:00:00 +10:00
- worldserver.addAllEntities(entityageable);
+ worldserver.addAllEntities(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
worldserver.broadcastEntityEffect(this, (byte) 18);
2021-06-11 15:00:00 +10:00
if (worldserver.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
2020-08-12 07:00:00 +10:00
- worldserver.addEntity(new EntityExperienceOrb(worldserver, this.locX(), this.locY(), this.locZ(), this.getRandom().nextInt(7) + 1));
2020-06-25 10:00:00 +10:00
+ // CraftBukkit start - use event experience
+ if (experience > 0) {
2020-08-12 07:00:00 +10:00
+ worldserver.addEntity(new EntityExperienceOrb(worldserver, this.locX(), this.locY(), this.locZ(), experience));
2020-06-25 10:00:00 +10:00
+ }
+ // CraftBukkit end
}
}