Mappings Update

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-06 10:00:00 +11:00
parent e9e6bec4e5
commit 102dee7d4f
123 changed files with 393 additions and 442 deletions

View File

@@ -203,7 +203,7 @@
if (this.updateEffects) {
if (!this.world.isClientSide) {
@@ -569,7 +672,13 @@
this.datawatcher.set(EntityLiving.g, Integer.valueOf(0));
this.datawatcher.set(EntityLiving.g, 0);
}
+ // CraftBukkit start
@@ -352,7 +352,7 @@
+ return (float) ((EntityPlayer) this).getBukkitEntity().getHealth();
+ }
+ // CraftBukkit end
return ((Float) this.datawatcher.get(EntityLiving.HEALTH)).floatValue();
return (Float) this.datawatcher.get(EntityLiving.HEALTH);
}
public void setHealth(float f) {
@@ -372,7 +372,7 @@
+ return;
+ }
+ // CraftBukkit end
this.datawatcher.set(EntityLiving.HEALTH, Float.valueOf(MathHelper.a(f, 0.0F, this.getMaxHealth())));
this.datawatcher.set(EntityLiving.HEALTH, MathHelper.a(f, 0.0F, this.getMaxHealth()));
}
@@ -711,15 +911,17 @@
@@ -733,7 +733,7 @@
this.setFlag(7, false);
}
} else {
@@ -1910,6 +2296,7 @@
@@ -1907,6 +2293,7 @@
}
if (!this.world.isClientSide) {
@@ -741,7 +741,7 @@
this.setFlag(7, flag);
}
@@ -2037,11 +2424,11 @@
@@ -2034,11 +2421,11 @@
}
public boolean isInteractable() {
@@ -755,7 +755,7 @@
}
protected void aA() {
@@ -2201,7 +2588,27 @@
@@ -2198,7 +2585,27 @@
protected void q() {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
this.b(this.activeItem, 16);
@@ -784,7 +784,7 @@
this.da();
}
@@ -2280,10 +2687,18 @@
@@ -2277,10 +2684,18 @@
}
if (flag1) {