2019-05-27 09:13:41 +00:00
|
|
|
From 18333843870e8b62ec99eb21aa3afb70b122d033 Mon Sep 17 00:00:00 2001
|
2018-06-21 03:19:46 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 19 Dec 2017 16:24:42 -0500
|
|
|
|
Subject: [PATCH] Expand Explosions API
|
|
|
|
|
|
|
|
Add Entity as a Source capability, and add more API choices, and on Location.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
2019-05-06 02:58:04 +00:00
|
|
|
index 5730d5f4..b226d7e4 100644
|
2018-06-21 03:19:46 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Location.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -7,6 +7,7 @@ import java.util.HashMap;
|
2019-04-23 04:47:07 +00:00
|
|
|
import java.util.Map;
|
2019-03-20 00:28:15 +00:00
|
|
|
import org.bukkit.block.Block;
|
|
|
|
import org.bukkit.configuration.serialization.ConfigurationSerializable;
|
|
|
|
+import org.bukkit.entity.Entity; // Paper
|
|
|
|
import org.bukkit.util.NumberConversions;
|
|
|
|
import org.bukkit.util.Vector;
|
|
|
|
import org.jetbrains.annotations.NotNull;
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
2019-03-20 00:28:15 +00:00
|
|
|
return centerLoc;
|
2018-06-21 03:19:46 +00:00
|
|
|
}
|
2019-03-20 01:46:00 +00:00
|
|
|
|
2018-06-21 03:19:46 +00:00
|
|
|
+ /**
|
|
|
|
+ * Creates explosion at this location with given power
|
|
|
|
+ *
|
|
|
|
+ * 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) {
|
2019-05-06 02:58:04 +00:00
|
|
|
+ return this.getWorld().createExplosion(this, power);
|
2018-06-21 03:19:46 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates explosion at this location with given power and optionally
|
|
|
|
+ * setting blocks on fire.
|
|
|
|
+ *
|
|
|
|
+ * Will break blocks.
|
|
|
|
+ *
|
|
|
|
+ * @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 boolean createExplosion(float power, boolean setFire) {
|
2019-05-06 02:58:04 +00:00
|
|
|
+ return this.getWorld().createExplosion(this, power, setFire);
|
2018-06-21 03:19:46 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 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 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 boolean createExplosion(float power, boolean setFire, boolean breakBlocks) {
|
2019-05-06 02:58:04 +00:00
|
|
|
+ return this.getWorld().createExplosion(this, power, setFire, breakBlocks);
|
2018-06-21 03:19:46 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates explosion at this location with given power, with the specified entity as the source.
|
|
|
|
+ *
|
|
|
|
+ * Will break blocks and ignite blocks on fire.
|
|
|
|
+ *
|
2018-08-16 11:20:58 +00:00
|
|
|
+ * @param source The source entity of the explosion
|
2018-06-21 03:19:46 +00:00
|
|
|
+ * @param power The power of explosion, where 4F is TNT
|
|
|
|
+ * @return false if explosion was canceled, otherwise true
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public boolean createExplosion(@Nullable Entity source, float power) {
|
2019-05-06 02:58:04 +00:00
|
|
|
+ return this.getWorld().createExplosion(source, this, power, true, true);
|
2018-06-21 03:19:46 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates explosion at this location with given power and optionally
|
|
|
|
+ * setting blocks on fire, with the specified entity as the source.
|
|
|
|
+ *
|
|
|
|
+ * Will break blocks.
|
|
|
|
+ *
|
2018-08-16 11:20:58 +00:00
|
|
|
+ * @param source The source entity of the explosion
|
2018-06-21 03:19:46 +00:00
|
|
|
+ * @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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public boolean createExplosion(@Nullable Entity source, float power, boolean setFire) {
|
2019-05-06 02:58:04 +00:00
|
|
|
+ return this.getWorld().createExplosion(source, this, power, setFire, true);
|
2018-06-21 03:19:46 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates explosion at this location with given power and optionally
|
|
|
|
+ * setting blocks on fire, with the specified entity as the source.
|
|
|
|
+ *
|
2018-08-16 11:20:58 +00:00
|
|
|
+ * @param source The source entity of the explosion
|
2018-06-21 03:19:46 +00:00
|
|
|
+ * @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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
|
2019-05-06 02:58:04 +00:00
|
|
|
+ return this.getWorld().createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
|
2018-06-21 03:19:46 +00:00
|
|
|
+ }
|
2019-03-20 01:46:00 +00:00
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Returns a list of entities within a bounding box centered around a Location.
|
|
|
|
*
|
2018-06-21 03:19:46 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
2019-05-27 09:13:41 +00:00
|
|
|
index fbd61137..8f69dced 100644
|
2018-06-21 03:19:46 +00:00
|
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
|
|
+++ b/src/main/java/org/bukkit/World.java
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -1201,6 +1201,102 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2018-06-21 03:19:46 +00:00
|
|
|
*/
|
2019-03-20 00:28:15 +00:00
|
|
|
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
|
2018-06-21 03:19:46 +00:00
|
|
|
|
|
|
|
+ // 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
|
2018-08-16 11:20:58 +00:00
|
|
|
+ * @param loc Location to blow up
|
2018-06-21 03:19:46 +00:00
|
|
|
+ * @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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire, boolean breakBlocks);
|
2018-06-21 03:19:46 +00:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 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
|
2018-08-16 11:20:58 +00:00
|
|
|
+ * @param loc Location to blow up
|
2018-06-21 03:19:46 +00:00
|
|
|
+ * @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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire) {
|
2018-06-21 03:19:46 +00:00
|
|
|
+ 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
|
2018-08-16 11:20:58 +00:00
|
|
|
+ * @param loc Location to blow up
|
2018-06-21 03:19:46 +00:00
|
|
|
+ * @param power The power of explosion, where 4F is TNT
|
|
|
|
+ * @return false if explosion was canceled, otherwise true
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public default boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power) {
|
2018-06-21 03:19:46 +00:00
|
|
|
+ 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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public default boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
|
2018-06-21 03:19:46 +00:00
|
|
|
+ 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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public default boolean createExplosion(@NotNull Entity source, float power, boolean setFire) {
|
2018-06-21 03:19:46 +00:00
|
|
|
+ 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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public default boolean createExplosion(@NotNull Entity source, float power) {
|
2018-06-21 03:19:46 +00:00
|
|
|
+ return createExplosion(source, source.getLocation(), power, true, true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Creates explosion at given location with given power and optionally
|
|
|
|
+ * setting blocks on fire or breaking blocks.
|
|
|
|
+ *
|
|
|
|
+ * @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
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public default boolean createExplosion(@NotNull Location loc, float power, boolean setFire, boolean breakBlocks) {
|
2018-06-21 03:19:46 +00:00
|
|
|
+ return createExplosion(loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Gets the {@link Environment} type of this world
|
|
|
|
*
|
|
|
|
--
|
2019-03-20 00:28:15 +00:00
|
|
|
2.21.0
|
2018-06-21 03:19:46 +00:00
|
|
|
|