Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
36f34f01c0
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
201 Zeilen
8.7 KiB
Diff
201 Zeilen
8.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 4cf22afc3c1f1cc19b6e5350043431215908a612..ac3c8eef58872c2de840a4b7ba7d77c2e597aee0 100644
|
|
--- a/src/main/java/org/bukkit/Location.java
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
|
@@ -7,6 +7,7 @@ import java.util.HashMap;
|
|
import java.util.Map;
|
|
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;
|
|
@@ -568,6 +569,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
|
return centerLoc;
|
|
}
|
|
|
|
+ /**
|
|
+ * 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) {
|
|
+ return this.getWorld().createExplosion(this, power);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * 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) {
|
|
+ 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 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) {
|
|
+ return this.getWorld().createExplosion(this, power, setFire, breakBlocks);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Creates explosion at this location with given power, with the specified entity as the source.
|
|
+ *
|
|
+ * 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.
|
|
+ *
|
|
+ * Will break 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 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 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(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
|
|
+ return this.getWorld().createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
|
|
+ }
|
|
+
|
|
/**
|
|
* Returns a list of entities within a bounding box centered around a Location.
|
|
*
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 085c7a42c3e758770d5883e3cddf896ac6b7645b..08985f77dce71ebd76510be873043e34ac34a821 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -1354,6 +1354,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
|
*/
|
|
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
|
|
+ * @return false if explosion was canceled, otherwise true
|
|
+ */
|
|
+ public boolean createExplosion(@Nullable Entity source, @NotNull Location loc, float power, boolean setFire, boolean breakBlocks);
|
|
+
|
|
+ /**
|
|
+ * 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
|
|
* setting blocks on fire or breaking blocks.
|