Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location. Co-authored-by: Esoteric Enderman <90862990+EsotericEnderman@users.noreply.github.com> Co-authored-by: Bjarne Koll <git@lynxplay.dev>
This commit is contained in:
@@ -7,6 +7,7 @@ import java.util.HashMap;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
||||||
|
import org.bukkit.entity.Entity; // Paper
|
||||||
import org.bukkit.util.NumberConversions;
|
import org.bukkit.util.NumberConversions;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
@@ -569,6 +570,89 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
|
|||||||
}
|
}
|
||||||
// Paper end - expand Location API
|
// Paper end - expand Location API
|
||||||
|
|
||||||
|
// Paper start - Expand Explosions API
|
||||||
|
/**
|
||||||
|
* Creates explosion at this location with given power
|
||||||
|
* <p>
|
||||||
|
* Will break blocks and ignite blocks on fire.
|
||||||
|
*
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(float power) {
|
||||||
|
return this.getWorld().createExplosion(this, power);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at this location with given power and optionally
|
||||||
|
* setting blocks on fire.
|
||||||
|
* <p>
|
||||||
|
* Will break blocks.
|
||||||
|
*
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether to set blocks on fire
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(float power, boolean setFire) {
|
||||||
|
return this.getWorld().createExplosion(this, power, setFire);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at this location with given power and optionally
|
||||||
|
* setting blocks on fire.
|
||||||
|
*
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether to set blocks on fire
|
||||||
|
* @param breakBlocks Whether to have blocks be destroyed
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(float power, boolean setFire, boolean breakBlocks) {
|
||||||
|
return this.getWorld().createExplosion(this, power, setFire, breakBlocks);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at this location with given power, with the specified entity as the source.
|
||||||
|
* <p>
|
||||||
|
* Will break blocks and ignite blocks on fire.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(@Nullable Entity source, float power) {
|
||||||
|
return this.getWorld().createExplosion(source, this, power, true, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at this location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
* <p>
|
||||||
|
* Will break blocks.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether to set blocks on fire
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(@Nullable Entity source, float power, boolean setFire) {
|
||||||
|
return this.getWorld().createExplosion(source, this, power, setFire, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at this location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether to set blocks on fire
|
||||||
|
* @param breakBlocks Whether to have blocks be destroyed
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(@Nullable Entity source, float power, boolean setFire, boolean breakBlocks) {
|
||||||
|
return this.getWorld().createExplosion(source, this, power, setFire, breakBlocks);
|
||||||
|
}
|
||||||
|
// Paper end - Expand Explosions API
|
||||||
|
|
||||||
// Paper start - additional getNearbyEntities API
|
// Paper start - additional getNearbyEntities API
|
||||||
/**
|
/**
|
||||||
* Returns a list of entities within a bounding box centered around a Location.
|
* Returns a list of entities within a bounding box centered around a Location.
|
||||||
|
|||||||
@@ -1424,6 +1424,104 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|||||||
*/
|
*/
|
||||||
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
|
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
|
||||||
|
|
||||||
|
// Paper start
|
||||||
|
/**
|
||||||
|
* Creates explosion at given location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param loc Location to blow up
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether or not to set blocks on fire
|
||||||
|
* @param breakBlocks Whether or not to have blocks be destroyed
|
||||||
|
* @param excludeSourceFromDamage whether the explosion should exclude the passed source from taking damage like vanilla explosions do.
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire, boolean breakBlocks, boolean excludeSourceFromDamage);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at given location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param loc Location to blow up
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether or not to set blocks on fire
|
||||||
|
* @param breakBlocks Whether or not to have blocks be destroyed
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire, boolean breakBlocks) {
|
||||||
|
return createExplosion(source, loc, power, setFire, breakBlocks, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at given location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* Will destroy other blocks
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param loc Location to blow up
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether or not to set blocks on fire
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire) {
|
||||||
|
return createExplosion(source, loc, power, setFire, true);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Creates explosion at given location with given power, with the specified entity as the source.
|
||||||
|
* Will set blocks on fire and destroy blocks.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param loc Location to blow up
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power) {
|
||||||
|
return createExplosion(source, loc, power, true, true);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Creates explosion at given entities location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether or not to set blocks on fire
|
||||||
|
* @param breakBlocks Whether or not to have blocks be destroyed
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public default boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
|
||||||
|
return createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Creates explosion at given entities location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* Will destroy blocks.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @param setFire Whether or not to set blocks on fire
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public default boolean createExplosion(@NotNull Entity source, float power, boolean setFire) {
|
||||||
|
return createExplosion(source, source.getLocation(), power, setFire, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates explosion at given entities location with given power and optionally
|
||||||
|
* setting blocks on fire, with the specified entity as the source.
|
||||||
|
*
|
||||||
|
* @param source The source entity of the explosion
|
||||||
|
* @param power The power of explosion, where 4F is TNT
|
||||||
|
* @return false if explosion was canceled, otherwise true
|
||||||
|
*/
|
||||||
|
public default boolean createExplosion(@NotNull Entity source, float power) {
|
||||||
|
return createExplosion(source, source.getLocation(), power, true, true);
|
||||||
|
}
|
||||||
|
// Paper end
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates explosion at given coordinates with given power and optionally
|
* Creates explosion at given coordinates with given power and optionally
|
||||||
* setting blocks on fire or breaking blocks.
|
* setting blocks on fire or breaking blocks.
|
||||||
|
|||||||
Reference in New Issue
Block a user