Paper/nms-patches/EntityHorseAbstract.patch

111 lines
3.7 KiB
Diff
Raw Normal View History

2016-11-17 02:41:03 +01:00
--- a/net/minecraft/server/EntityHorseAbstract.java
+++ b/net/minecraft/server/EntityHorseAbstract.java
@@ -6,6 +6,7 @@
import java.util.List;
2016-02-29 22:32:46 +01:00
import java.util.UUID;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; // CraftBukkit
2016-11-17 02:41:03 +01:00
public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, IJumpable {
@@ -39,6 +40,7 @@
2017-05-14 04:00:00 +02:00
private float bT;
protected boolean bF = true;
protected int bG;
+ public int maxDomestication = 100; // CraftBukkit - store max domestication value
2016-11-17 02:41:03 +01:00
public EntityHorseAbstract(World world) {
super(world);
2017-05-14 04:00:00 +02:00
@@ -214,7 +216,7 @@
public void loadChest() {
InventoryHorseChest inventoryhorsechest = this.inventoryChest;
2017-06-08 10:00:00 +02:00
- this.inventoryChest = new InventoryHorseChest("HorseChest", this.dn());
+ this.inventoryChest = new InventoryHorseChest("HorseChest", this.dn(), this); // CraftBukkit
this.inventoryChest.a(this.getName());
if (inventoryhorsechest != null) {
inventoryhorsechest.b(this);
2016-11-17 02:41:03 +01:00
@@ -354,7 +356,7 @@
}
public int getMaxDomestication() {
- return 100;
+ return this.maxDomestication; // CraftBukkit - return stored max domestication instead of 100
}
2017-06-08 10:00:00 +02:00
protected float cq() {
2016-11-17 02:41:03 +01:00
@@ -414,7 +416,7 @@
}
2016-11-17 02:41:03 +01:00
if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
- this.heal(f);
+ this.heal(f, RegainReason.EATING); // CraftBukkit
flag = true;
}
2016-11-17 02:41:03 +01:00
@@ -465,7 +467,7 @@
2016-04-26 01:26:20 +02:00
}
public void die(DamageSource damagesource) {
2016-04-26 01:26:20 +02:00
- super.die(damagesource);
+ // super.die(damagesource); // Moved down
2016-11-17 02:41:03 +01:00
if (!this.world.isClientSide && this.inventoryChest != null) {
for (int i = 0; i < this.inventoryChest.getSize(); ++i) {
ItemStack itemstack = this.inventoryChest.getItem(i);
@@ -476,6 +478,7 @@
}
}
2016-04-26 01:26:20 +02:00
+ super.die(damagesource); // CraftBukkit
}
2016-02-29 22:32:46 +01:00
public void n() {
2016-11-17 02:41:03 +01:00
@@ -486,7 +489,7 @@
2016-02-29 22:32:46 +01:00
super.n();
2015-02-26 23:41:06 +01:00
if (!this.world.isClientSide) {
if (this.random.nextInt(900) == 0 && this.deathTicks == 0) {
- this.heal(1.0F);
+ this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
}
2017-06-08 10:00:00 +02:00
if (this.dJ()) {
2017-05-14 04:00:00 +02:00
@@ -723,6 +726,7 @@
2016-02-29 22:32:46 +01:00
if (this.getOwnerUUID() != null) {
nbttagcompound.setString("OwnerUUID", this.getOwnerUUID().toString());
}
+ nbttagcompound.setInt("Bukkit.MaxDomestication", this.maxDomestication); // CraftBukkit
2016-02-29 22:32:46 +01:00
2016-11-17 02:41:03 +01:00
if (!this.inventoryChest.getItem(0).isEmpty()) {
nbttagcompound.set("SaddleItem", this.inventoryChest.getItem(0).save(new NBTTagCompound()));
2017-05-14 04:00:00 +02:00
@@ -749,6 +753,11 @@
2016-11-17 02:41:03 +01:00
if (!s.isEmpty()) {
2016-02-29 22:32:46 +01:00
this.setOwnerUUID(UUID.fromString(s));
}
+ // CraftBukkit start
+ if (nbttagcompound.hasKey("Bukkit.MaxDomestication")) {
+ this.maxDomestication = nbttagcompound.getInt("Bukkit.MaxDomestication");
+ }
+ // CraftBukkit end
2016-11-17 02:41:03 +01:00
AttributeInstance attributeinstance = this.getAttributeMap().a("Speed");
2017-05-14 04:00:00 +02:00
@@ -801,6 +810,18 @@
2016-02-29 22:32:46 +01:00
}
2017-05-14 04:00:00 +02:00
public void b_(int i) {
2016-02-29 22:32:46 +01:00
+ // CraftBukkit start
+ float power;
+ if (i >= 90) {
+ power = 1.0F;
+ } else {
+ power = 0.4F + 0.4F * (float) i / 90.0F;
+ }
+ org.bukkit.event.entity.HorseJumpEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callHorseJumpEvent(this, power);
2016-02-29 22:32:46 +01:00
+ if (event.isCancelled()) {
+ return;
+ }
+ // CraftBukkit end
this.canSlide = true;
2017-06-08 10:00:00 +02:00
this.dt();
}