twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 18:22:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source
This commit is contained in:
md_5
2017-05-14 12:00:00 +10:00
parent 6e3cec8bc7
commit 5195487ec6
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
nms-patches/EntityHorseAbstract.patch
View File

@@ -9,23 +9,19 @@
public abstract class EntityHorseAbstract extends EntityAnimal implements IInventoryListener, IJumpable {
@@ -39,6 +40,7 @@
private float bS;
protected boolean bE = true;
protected int bF;
private float bT;
protected boolean bF = true;
protected int bG;
+ public int maxDomestication = 100; // CraftBukkit - store max domestication value
public EntityHorseAbstract(World world) {
super(world);
@@ -211,10 +213,10 @@
return 2;
}
- protected void dx() {
+ public void dx() { // PAIL: protected-> public, rename
@@ -214,7 +216,7 @@
public void loadChest() {
InventoryHorseChest inventoryhorsechest = this.inventoryChest;
- this.inventoryChest = new InventoryHorseChest("HorseChest", this.di());
+ this.inventoryChest = new InventoryHorseChest("HorseChest", this.di(), this); // CraftBukkit
- this.inventoryChest = new InventoryHorseChest("HorseChest", this.dl());
+ this.inventoryChest = new InventoryHorseChest("HorseChest", this.dl(), this); // CraftBukkit
this.inventoryChest.a(this.getName());
if (inventoryhorsechest != null) {
inventoryhorsechest.b(this);
@@ -37,7 +33,7 @@
+ return this.maxDomestication; // CraftBukkit - return stored max domestication instead of 100
}
protected float ci() {
protected float co() {
@@ -414,7 +416,7 @@
}
@@ -72,8 +68,8 @@
+ this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
}
if (this.dE()) {
@@ -719,6 +722,7 @@
if (this.dH()) {
@@ -723,6 +726,7 @@
if (this.getOwnerUUID() != null) {
nbttagcompound.setString("OwnerUUID", this.getOwnerUUID().toString());
}
@@ -81,7 +77,7 @@
if (!this.inventoryChest.getItem(0).isEmpty()) {
nbttagcompound.set("SaddleItem", this.inventoryChest.getItem(0).save(new NBTTagCompound()));
@@ -745,6 +749,11 @@
@@ -749,6 +753,11 @@
if (!s.isEmpty()) {
this.setOwnerUUID(UUID.fromString(s));
}
@@ -93,10 +89,10 @@
AttributeInstance attributeinstance = this.getAttributeMap().a("Speed");
@@ -797,6 +806,18 @@
@@ -801,6 +810,18 @@
}
public void b(int i) {
public void b_(int i) {
+ // CraftBukkit start
+ float power;
+ if (i >= 90) {
@@ -110,5 +106,5 @@
+ }
+ // CraftBukkit end
this.canSlide = true;
this.dL();
this.dr();
}