Update to Minecraft 1.15

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-12-11 09:00:00 +11:00
parent 1400103b2f
commit 0e142c7f03
293 changed files with 2875 additions and 2648 deletions

View File

@@ -9,14 +9,14 @@
public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, IJumpable {
@@ -33,6 +34,7 @@
private float bV;
protected boolean bG = true;
protected int bH;
private float bS;
protected boolean bD = true;
protected int bE;
+ public int maxDomestication = 100; // CraftBukkit - store max domestication value
protected EntityHorseAbstract(EntityTypes<? extends EntityHorseAbstract> entitytypes, World world) {
super(entitytypes, world);
@@ -209,7 +211,7 @@
@@ -210,7 +212,7 @@
public void loadChest() {
InventorySubcontainer inventorysubcontainer = this.inventoryChest;
@@ -25,7 +25,7 @@
if (inventorysubcontainer != null) {
inventorysubcontainer.b((IInventoryListener) this);
int i = Math.min(inventorysubcontainer.getSize(), this.inventoryChest.getSize());
@@ -332,7 +334,7 @@
@@ -333,7 +335,7 @@
}
public int getMaxDomestication() {
@@ -34,7 +34,7 @@
}
@Override
@@ -393,7 +395,7 @@
@@ -394,7 +396,7 @@
}
if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
@@ -43,7 +43,7 @@
flag = true;
}
@@ -469,7 +471,7 @@
@@ -470,7 +472,7 @@
super.movementTick();
if (!this.world.isClientSide && this.isAlive()) {
if (this.random.nextInt(900) == 0 && this.deathTicks == 0) {
@@ -51,8 +51,8 @@
+ this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
}
if (this.et()) {
@@ -716,6 +718,7 @@
if (this.eO()) {
@@ -717,6 +719,7 @@
if (this.getOwnerUUID() != null) {
nbttagcompound.setString("OwnerUUID", this.getOwnerUUID().toString());
}
@@ -60,7 +60,7 @@
if (!this.inventoryChest.getItem(0).isEmpty()) {
nbttagcompound.set("SaddleItem", this.inventoryChest.getItem(0).save(new NBTTagCompound()));
@@ -743,6 +746,11 @@
@@ -744,6 +747,11 @@
if (!s.isEmpty()) {
this.setOwnerUUID(UUID.fromString(s));
}
@@ -72,7 +72,7 @@
AttributeInstance attributeinstance = this.getAttributeMap().a("Speed");
@@ -800,6 +808,18 @@
@@ -801,6 +809,18 @@
@Override
public void b(int i) {
@@ -89,5 +89,5 @@
+ }
+ // CraftBukkit end
this.canSlide = true;
this.eB();
this.eW();
}