SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.10

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-06-09 11:43:49 +10:00
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
paper-server/nms-patches/EntityHorse.patch
View File

@@ -8,25 +8,25 @@
+
public class EntityHorse extends EntityAnimal implements IInventoryListener, IJumpable {
private static final Predicate<Entity> bC = new Predicate() {
@@ -53,6 +55,7 @@
private String ce;
private String[] cf = new String[3];
private boolean cg = false;
private static final Predicate<Entity> bD = new Predicate() {
@@ -52,6 +54,7 @@
private int ce;
private String cf;
private final String[] cg = new String[3];
+ public int maxDomestication = 100; // CraftBukkit - store max domestication value
public EntityHorse(World world) {
super(world);
@@ -321,7 +324,7 @@
@@ -320,7 +323,7 @@
public void loadChest() {
InventoryHorseChest inventoryhorsechest = this.inventoryChest;
- this.inventoryChest = new InventoryHorseChest("HorseChest", this.dJ());
+ this.inventoryChest = new InventoryHorseChest("HorseChest", this.dJ(), this); // CraftBukkit
- 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);
@@ -474,7 +477,7 @@
@@ -473,7 +476,7 @@
}
public int getMaxDomestication() {
@@ -34,8 +34,8 @@
+ return this.maxDomestication; // CraftBukkit - return stored max domestication instead of 100
}
protected float ce() {
@@ -564,7 +567,7 @@
protected float ch() {
@@ -563,7 +566,7 @@
}
if (this.getHealth() < this.getMaxHealth() && f > 0.0F) {
@@ -44,7 +44,7 @@
flag = true;
}
@@ -655,11 +658,11 @@
@@ -654,11 +657,11 @@
}
public void die(DamageSource damagesource) {
@@ -58,7 +58,7 @@
}
public void n() {
@@ -670,7 +673,7 @@
@@ -669,7 +672,7 @@
super.n();
if (!this.world.isClientSide) {
if (this.random.nextInt(900) == 0 && this.deathTicks == 0) {
@@ -66,8 +66,8 @@
+ this.heal(1.0F, RegainReason.REGEN); // CraftBukkit
}
if (!this.dn() && !this.isVehicle() && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) {
@@ -921,6 +924,7 @@
if (!this.dr() && !this.isVehicle() && this.random.nextInt(300) == 0 && this.world.getType(new BlockPosition(MathHelper.floor(this.locX), MathHelper.floor(this.locY) - 1, MathHelper.floor(this.locZ))).getBlock() == Blocks.GRASS) {
@@ -929,6 +932,7 @@
if (this.getOwnerUUID() != null) {
nbttagcompound.setString("OwnerUUID", this.getOwnerUUID().toString());
}
@@ -75,7 +75,7 @@
if (this.hasChest()) {
NBTTagList nbttaglist = new NBTTagList();
@@ -976,6 +980,12 @@
@@ -984,6 +988,12 @@
this.setOwnerUUID(UUID.fromString(s));
}
@@ -88,7 +88,7 @@
AttributeInstance attributeinstance = this.getAttributeMap().a("Speed");
if (attributeinstance != null) {
@@ -1148,6 +1158,18 @@
@@ -1156,6 +1166,18 @@
}
public void b(int i) {