OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 20:50:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix CraftBukkit diffs

Browse source
This commit is contained in:
Wesley Wolfe 2013-07-23 22:07:42 -05:00
parent e88cea8402
commit 0a9758ae54
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityLiving.java
View file

@ -82,7 +82,7 @@ public abstract class EntityLiving extends Entity {
public EntityLiving(World world) {
super(world);
this.ay();
// CraftBukkit - setHealth(getMaxHealth()) -> current - inlined to skip the instanceof check for EntityPlayers
// CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor
this.datawatcher.watch(6, (float) this.getAttributeInstance(GenericAttributes.a).getValue());
this.m = true;
this.aM = (float) (Math.random() + 1.0D) * 0.01F;
@ -584,7 +584,7 @@ public abstract class EntityLiving extends Entity {
}
public final float getHealth() {
// CraftBukkit start - Scaled Health
// CraftBukkit start - Use unscaled health
if (this instanceof EntityPlayer) {
return (float) ((EntityPlayer) this).getBukkitEntity().getHealth();
}
@ -593,7 +593,7 @@ public abstract class EntityLiving extends Entity {
}
public void setHealth(float f) {
// CraftBukkit start - Scaled Health
// CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
// Squeeze