mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-24 09:56:48 +02:00
44 lines
2.4 KiB
Diff
44 lines
2.4 KiB
Diff
--- a/net/minecraft/server/PathfinderGoalBreed.java
|
|
+++ b/net/minecraft/server/PathfinderGoalBreed.java
|
|
@@ -82,11 +82,24 @@
|
|
EntityAgeable entityageable = this.animal.createChild(this.partner);
|
|
|
|
if (entityageable != null) {
|
|
+ // CraftBukkit start - set persistence for tame animals
|
|
+ if (entityageable instanceof EntityTameableAnimal && ((EntityTameableAnimal) entityageable).isTamed()) {
|
|
+ entityageable.persistent = true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
EntityPlayer entityplayer = this.animal.getBreedCause();
|
|
|
|
if (entityplayer == null && this.partner.getBreedCause() != null) {
|
|
entityplayer = this.partner.getBreedCause();
|
|
}
|
|
+ // CraftBukkit start - call EntityBreedEvent
|
|
+ int experience = this.animal.getRandom().nextInt(7) + 1;
|
|
+ org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, animal, partner, entityplayer, this.animal.breedItem, experience);
|
|
+ if (entityBreedEvent.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ experience = entityBreedEvent.getExperience();
|
|
+ // CraftBukkit end
|
|
|
|
if (entityplayer != null) {
|
|
entityplayer.a(StatisticList.ANIMALS_BRED);
|
|
@@ -99,10 +112,14 @@
|
|
this.partner.resetLove();
|
|
entityageable.setAgeRaw(-24000);
|
|
entityageable.setPositionRotation(this.animal.locX(), this.animal.locY(), this.animal.locZ(), 0.0F, 0.0F);
|
|
- this.b.addEntity(entityageable);
|
|
+ this.b.addEntity(entityageable, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
|
|
this.b.broadcastEntityEffect(this.animal, (byte) 18);
|
|
if (this.b.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
|
|
- this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX(), this.animal.locY(), this.animal.locZ(), this.animal.getRandom().nextInt(7) + 1));
|
|
+ // CraftBukkit start - use event experience
|
|
+ if (experience > 0) {
|
|
+ this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX(), this.animal.locY(), this.animal.locZ(), experience));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
}
|