SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Fix CraftBukkit diffs

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Wesley Wolfe 2013-07-23 22:07:42 -05:00
Ursprung e88cea8402
Commit 0a9758ae54
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
src/main/java/net/minecraft/server/EntityLiving.java
Datei anzeigen

@ -82,7 +82,7 @@ public abstract class EntityLiving extends Entity {
public EntityLiving(World world) { public EntityLiving(World world) {
super(world); super(world);
this.ay(); 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.datawatcher.watch(6, (float) this.getAttributeInstance(GenericAttributes.a).getValue());
this.m = true; this.m = true;
this.aM = (float) (Math.random() + 1.0D) * 0.01F; this.aM = (float) (Math.random() + 1.0D) * 0.01F;
@ -584,7 +584,7 @@ public abstract class EntityLiving extends Entity {
} }
public final float getHealth() { public final float getHealth() {
// CraftBukkit start - Scaled Health // CraftBukkit start - Use unscaled health
if (this instanceof EntityPlayer) { if (this instanceof EntityPlayer) {
return (float) ((EntityPlayer) this).getBukkitEntity().getHealth(); return (float) ((EntityPlayer) this).getBukkitEntity().getHealth();
} }
@ -593,7 +593,7 @@ public abstract class EntityLiving extends Entity {
} }
public void setHealth(float f) { public void setHealth(float f) {
// CraftBukkit start - Scaled Health // CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) { if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
// Squeeze // Squeeze