Update Bukkit for Minecraft 1.6.1

By: Wesley Wolfe <weswolf@aol.com>
This commit is contained in:
Bukkit/Spigot
2013-07-01 05:50:24 -05:00
parent 4a573b3312
commit 153cde6043
13 changed files with 225 additions and 27 deletions

View File

@@ -4,6 +4,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.util.NumberConversions;
/**
* Raised when a vehicle receives damage.
@@ -11,10 +12,15 @@ import org.bukkit.event.HandlerList;
public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private final Entity attacker;
private int damage;
private double damage;
private boolean cancelled;
@Deprecated
public VehicleDamageEvent(final Vehicle vehicle, final Entity attacker, final int damage) {
this(vehicle, attacker, (double) damage);
}
public VehicleDamageEvent(final Vehicle vehicle, final Entity attacker, final double damage) {
super(vehicle);
this.attacker = attacker;
this.damage = damage;
@@ -34,19 +40,39 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
*
* @return the damage done to the vehicle
*/
public int getDamage() {
public double getDamage() {
return damage;
}
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*/
@Deprecated
public int _INVALID_getDamage() {
return NumberConversions.ceil(getDamage());
}
/**
* Sets the damage done to the vehicle
*
* @param damage The damage
*/
public void setDamage(int damage) {
public void setDamage(double damage) {
this.damage = damage;
}
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*/
@Deprecated
public void _INVALID_setDamage(int damage) {
setDamage(damage);
}
public boolean isCancelled() {
return cancelled;
}