13
0
geforkt von Mirrors/Paper

Remove _INVALID_ methods

By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2017-05-14 12:00:00 +10:00
Ursprung 9cf4fbdb11
Commit b2156bae0d
9 geänderte Dateien mit 0 neuen und 229 gelöschten Zeilen

Datei anzeigen

@ -109,21 +109,6 @@ public final class Bukkit {
return server.getBukkitVersion(); return server.getBukkitVersion();
} }
/**
* Gets an array copy of all currently logged in players.
* <p>
* 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 superseded by {@link #getOnlinePlayers()}
* @return an array of Players that are currently online
*/
@Deprecated
public static Player[] _INVALID_getOnlinePlayers() {
return server._INVALID_getOnlinePlayers();
}
/** /**
* Gets a view of all currently logged in players. This {@linkplain * Gets a view of all currently logged in players. This {@linkplain
* Collections#unmodifiableCollection(Collection) view} is a reused * Collections#unmodifiableCollection(Collection) view} is a reused

Datei anzeigen

@ -89,19 +89,6 @@ public interface Server extends PluginMessageRecipient {
*/ */
public String getBukkitVersion(); public String getBukkitVersion();
/**
* Gets an array copy of all currently logged in players.
* <p>
* 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 superseded by {@link #getOnlinePlayers()}
* @return an array of Players that are currently online
*/
@Deprecated
public Player[] _INVALID_getOnlinePlayers();
/** /**
* Gets a view of all currently logged in players. This {@linkplain * Gets a view of all currently logged in players. This {@linkplain
* Collections#unmodifiableCollection(Collection) view} is a reused * Collections#unmodifiableCollection(Collection) view} is a reused

Datei anzeigen

@ -13,16 +13,6 @@ public interface Damageable extends Entity {
*/ */
void damage(double amount); void damage(double amount);
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param amount Amount of damage to deal
*/
@Deprecated
void _INVALID_damage(int amount);
/** /**
* Deals the given amount of damage to this entity, from a specified * Deals the given amount of damage to this entity, from a specified
* entity. * entity.
@ -32,17 +22,6 @@ public interface Damageable extends Entity {
*/ */
void damage(double amount, Entity source); void damage(double amount, Entity source);
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param amount Amount of damage to deal
* @param source Entity which to attribute this damage from
*/
@Deprecated
void _INVALID_damage(int amount, Entity source);
/** /**
* Gets the entity's health from 0 to {@link #getMaxHealth()}, where 0 is dead. * Gets the entity's health from 0 to {@link #getMaxHealth()}, where 0 is dead.
* *
@ -50,16 +29,6 @@ public interface Damageable extends Entity {
*/ */
double getHealth(); double getHealth();
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @return Health represented from 0 to max
*/
@Deprecated
int _INVALID_getHealth();
/** /**
* Sets the entity's health from 0 to {@link #getMaxHealth()}, where 0 is * Sets the entity's health from 0 to {@link #getMaxHealth()}, where 0 is
* dead. * dead.
@ -70,18 +39,6 @@ public interface Damageable extends Entity {
*/ */
void setHealth(double health); void setHealth(double health);
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param health New health represented from 0 to max
* @throws IllegalArgumentException Thrown if the health is {@literal < 0 or >}
* {@link #getMaxHealth()}
*/
@Deprecated
void _INVALID_setHealth(int health);
/** /**
* Gets the maximum health this entity has. * Gets the maximum health this entity has.
* *
@ -91,16 +48,6 @@ public interface Damageable extends Entity {
@Deprecated @Deprecated
double getMaxHealth(); double getMaxHealth();
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @return Maximum health
*/
@Deprecated
int _INVALID_getMaxHealth();
/** /**
* Sets the maximum health this entity can have. * Sets the maximum health this entity can have.
* <p> * <p>
@ -116,16 +63,6 @@ public interface Damageable extends Entity {
@Deprecated @Deprecated
void setMaxHealth(double health); void setMaxHealth(double health);
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param health amount of health to set the maximum to
*/
@Deprecated
void _INVALID_setMaxHealth(int health);
/** /**
* Resets the max health to the original amount. * Resets the max health to the original amount.
* @deprecated use {@link Attribute#GENERIC_MAX_HEALTH}. * @deprecated use {@link Attribute#GENERIC_MAX_HEALTH}.

Datei anzeigen

@ -168,16 +168,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/ */
public double getLastDamage(); public double getLastDamage();
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @return damage taken since the last no damage ticks time period
*/
@Deprecated
public int _INVALID_getLastDamage();
/** /**
* Sets the damage dealt within the current no damage ticks time period. * Sets the damage dealt within the current no damage ticks time period.
* *
@ -185,16 +175,6 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
*/ */
public void setLastDamage(double damage); public void setLastDamage(double 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.
*
* @param damage amount of damage
*/
@Deprecated
public void _INVALID_setLastDamage(int damage);
/** /**
* Returns the living entity's current no damage ticks. * Returns the living entity's current no damage ticks.
* *

Datei anzeigen

@ -9,16 +9,6 @@ import org.bukkit.util.Vector;
*/ */
public interface Minecart extends Vehicle { public interface Minecart extends Vehicle {
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param damage over 40 to "kill" a minecart
*/
@Deprecated
public void _INVALID_setDamage(int damage);
/** /**
* Sets a minecart's damage. * Sets a minecart's damage.
* *
@ -26,16 +16,6 @@ public interface Minecart extends Vehicle {
*/ */
public void setDamage(double damage); public void setDamage(double 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.
*
* @return The damage
*/
@Deprecated
public int _INVALID_getDamage();
/** /**
* Gets a minecart's damage. * Gets a minecart's damage.
* *

Datei anzeigen

@ -7,16 +7,6 @@ import org.bukkit.projectiles.ProjectileSource;
*/ */
public interface Projectile extends Entity { public interface Projectile extends Entity {
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @return the {@link LivingEntity} that shot this projectile
*/
@Deprecated
public LivingEntity _INVALID_getShooter();
/** /**
* Retrieve the shooter of this projectile. * Retrieve the shooter of this projectile.
* *
@ -24,16 +14,6 @@ public interface Projectile extends Entity {
*/ */
public ProjectileSource getShooter(); public ProjectileSource getShooter();
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param shooter the {@link LivingEntity} that shot this projectile
*/
@Deprecated
public void _INVALID_setShooter(LivingEntity shooter);
/** /**
* Set the shooter of this projectile. * Set the shooter of this projectile.
* *

Datei anzeigen

@ -145,18 +145,6 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
return damage; 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.
*
* @return the (rounded) damage
*/
@Deprecated
public int _INVALID_getDamage() {
return NumberConversions.ceil(getDamage());
}
/** /**
* Sets the raw amount of damage caused by the event. * Sets the raw amount of damage caused by the event.
* <p> * <p>
@ -194,18 +182,6 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
setDamage(DamageModifier.BASE, damage); setDamage(DamageModifier.BASE, 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.
*
* @param damage the new damage value
*/
@Deprecated
public void _INVALID_setDamage(int damage) {
setDamage(damage);
}
/** /**
* Gets the cause of the damage. * Gets the cause of the damage.
* *

Datei anzeigen

@ -29,18 +29,6 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
return amount; return amount;
} }
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @return the (rounded) amount regained
*/
@Deprecated
public int _INVALID_getAmount() {
return NumberConversions.ceil(getAmount());
}
/** /**
* Sets the amount of regained health * Sets the amount of regained health
* *
@ -50,18 +38,6 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable
this.amount = amount; this.amount = amount;
} }
/**
* This method exists for legacy reasons to provide backwards
* compatibility. It will not exist at runtime and should not be used
* under any circumstances.
*
* @param amount the amount that will be regained
*/
@Deprecated
public void _INVALID_setAmount(int amount) {
setAmount(amount);
}
@Override @Override
public boolean isCancelled() { public boolean isCancelled() {
return cancelled; return cancelled;

Datei anzeigen

@ -4,7 +4,6 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Vehicle; import org.bukkit.entity.Vehicle;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.util.NumberConversions;
/** /**
* Raised when a vehicle receives damage. * Raised when a vehicle receives damage.
@ -15,11 +14,6 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
private double damage; private double damage;
private boolean cancelled; 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) { public VehicleDamageEvent(final Vehicle vehicle, final Entity attacker, final double damage) {
super(vehicle); super(vehicle);
this.attacker = attacker; this.attacker = attacker;
@ -44,18 +38,6 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
return damage; 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.
*
* @return the damage
*/
@Deprecated
public int _INVALID_getDamage() {
return NumberConversions.ceil(getDamage());
}
/** /**
* Sets the damage done to the vehicle * Sets the damage done to the vehicle
* *
@ -65,18 +47,6 @@ public class VehicleDamageEvent extends VehicleEvent implements Cancellable {
this.damage = 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.
*
* @param damage the damage
*/
@Deprecated
public void _INVALID_setDamage(int damage) {
setDamage(damage);
}
public boolean isCancelled() { public boolean isCancelled() {
return cancelled; return cancelled;
} }