mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
This commit is contained in:
parent
a5285de480
commit
980d53d156
42 changed files with 302 additions and 110 deletions
|
@ -1,37 +0,0 @@
|
|||
From 8c10030d2ddd7eb0274ddbfd30318e68454db888 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 19 Dec 2017 16:24:42 -0500
|
||||
Subject: [PATCH] Add World#createExplosion(Location, float, boolean, boolean)
|
||||
API
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 0bc47dd6..7687f882 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -754,6 +754,22 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
*/
|
||||
public boolean createExplosion(Location loc, float power, boolean setFire);
|
||||
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Creates explosion at given coordinates 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
|
||||
+ */
|
||||
+ public default boolean createExplosion(Location loc, float power, boolean setFire, boolean breakBlocks) {
|
||||
+ return createExplosion(loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks);
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* Gets the {@link Environment} type of this world
|
||||
*
|
||||
--
|
||||
2.15.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 6cb0feab026b4f79e51b1f840c8ad5be852013ca Mon Sep 17 00:00:00 2001
|
||||
From 1dcc1f273169ef66f371e8d44ae5133bc314b7df Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 19 Dec 2017 22:00:41 -0500
|
||||
Subject: [PATCH] PlayerPickupExperienceEvent
|
||||
|
@ -88,5 +88,5 @@ index 00000000..f9ef95cd
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 618b35fdfaa7ce6b1fea185bca94cc8f736839c9 Mon Sep 17 00:00:00 2001
|
||||
From 796e5d95f60258b2f2c2e8d665f09c5d01fb9823 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 19 Dec 2017 22:56:24 -0500
|
||||
Subject: [PATCH] ExperienceOrbMergeEvent
|
||||
|
@ -96,5 +96,5 @@ index 00000000..fb5b4b86
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 28c0d637302920bc0e79dd70ed34d67221c51efe Mon Sep 17 00:00:00 2001
|
||||
From 6634c8cb6d911a9a2f4a4c9a75086cce90195078 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 20 Dec 2017 17:38:07 -0500
|
||||
Subject: [PATCH] Ability to apply mending to XP API
|
||||
|
@ -49,5 +49,5 @@ index 23cc8b5e..a882323d 100644
|
|||
/**
|
||||
* Gives the player the amount of experience levels specified. Levels can
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 7d386845b7417cb8d36aea49b63de9db5f9209c4 Mon Sep 17 00:00:00 2001
|
||||
From 3c047d4917be9616b971aa725a2682d45f814b6d Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 14 Jan 2018 16:59:43 -0500
|
||||
Subject: [PATCH] PreCreatureSpawnEvent
|
||||
|
@ -119,5 +119,5 @@ index 00000000..bac1cef3
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 10e8807ee044f09bbe115a187eee5a2cef747400 Mon Sep 17 00:00:00 2001
|
||||
From 54bc8edf2d329bbfeb5e48fda52d44bf6fe8a47e Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 14 Jan 2018 17:31:37 -0500
|
||||
Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
|
||||
|
@ -76,5 +76,5 @@ index 00000000..7c6953a7
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 34a4c1db4e30ccee65528ce7ef69e522bdc9d1d7 Mon Sep 17 00:00:00 2001
|
||||
From 96d8312552c442c8489d6dbb914f0623ad74b66b Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Fri, 19 Jan 2018 00:29:28 -0500
|
||||
Subject: [PATCH] Add SkullMeta.setPlayerProfile API
|
||||
|
@ -44,5 +44,5 @@ index c60860e1..3eea5909 100644
|
|||
* Gets the owner of the skull.
|
||||
*
|
||||
--
|
||||
2.15.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4108c18902957c3f99f85ef35e3de5e3cce53c4a Mon Sep 17 00:00:00 2001
|
||||
From 6411e77da00dacbe848850db4660c86130fda955 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 2 Jan 2018 00:31:08 -0500
|
||||
Subject: [PATCH] Fill Profile Property Events
|
||||
|
@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..e8f6e7c1
|
||||
index 00000000..182bd661
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java
|
||||
@@ -0,0 +1,72 @@
|
||||
|
@ -90,7 +90,7 @@ index 00000000..e8f6e7c1
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..f7b332e1
|
||||
index 00000000..aba0c087
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java
|
||||
@@ -0,0 +1,74 @@
|
||||
|
@ -169,5 +169,5 @@ index 00000000..f7b332e1
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4d81773878266032eac2dc2a2eb15ad862c71b13 Mon Sep 17 00:00:00 2001
|
||||
From afa05f7fef0d3337d684319325143b4d441cea16 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Fri, 19 Jan 2018 08:15:14 -0600
|
||||
Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
|
||||
|
@ -69,5 +69,5 @@ index 00000000..b65ee9e5
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.11.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 5693424dde394e10b75b66196abb65c85c271dd2 Mon Sep 17 00:00:00 2001
|
||||
From f8f9ee57846ba4838769c0eb20ef870dc14cb793 Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sat, 27 Jan 2018 17:06:24 -0500
|
||||
Subject: [PATCH] Add ArmorStand Item Meta
|
||||
|
@ -95,5 +95,5 @@ index 00000000..7e4acfff
|
|||
+ void setMarker(boolean marker);
|
||||
+}
|
||||
--
|
||||
2.14.3
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 4e2c715cb4a31b2fa1c1d2fd441ea6fef3864cad Mon Sep 17 00:00:00 2001
|
||||
From cd7a3c2d083750dfd3c520841072a4b7ed8c469b Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 18 Jan 2018 01:00:27 -0500
|
||||
Subject: [PATCH] Optimize Hoppers
|
||||
|
@ -38,5 +38,5 @@ index 06ec99ae..b44cc45b 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.16.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From d3a0a6fbeca31ad336ecf6c6939d021161e0edad Mon Sep 17 00:00:00 2001
|
||||
From 3ff6fc393591f3a29c98ae084e1c67be2eacdee6 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 24 Feb 2018 00:55:52 -0500
|
||||
Subject: [PATCH] Tameable#getOwnerUniqueId API
|
||||
|
@ -33,5 +33,5 @@ index 44497aa3..0987c1e8 100644
|
|||
*/
|
||||
public AnimalTamer getOwner();
|
||||
--
|
||||
2.16.1
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From b4f2e1cd5828d6ef07b9e674d27f4b1c98d2d2c0 Mon Sep 17 00:00:00 2001
|
||||
From 41c7e4edd8c9d6e23f7a546ccee245eea652f073 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 18 Mar 2018 11:43:30 -0400
|
||||
Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
|
||||
|
@ -51,5 +51,5 @@ index 1d571889..0c16128e 100644
|
|||
this.message = "";
|
||||
this.name = name;
|
||||
--
|
||||
2.16.2
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From f95d94a0aae2bdf7ba855b6149ee8c24bf86ffe1 Mon Sep 17 00:00:00 2001
|
||||
From d2e267fceb2a1990a2a95c57fd50e653212e5260 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Wed, 11 Oct 2017 15:55:38 +0200
|
||||
Subject: [PATCH] Add extended PaperServerListPingEvent
|
||||
|
@ -366,5 +366,5 @@ index 04804706..44563482 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.16.2
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From d9f260928670e8d9910d4eede929f7eebd5a4028 Mon Sep 17 00:00:00 2001
|
||||
From d35e326f5e55fa14cdf9b1eacba970704ddcc16e Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Mon, 27 Nov 2017 16:21:19 +0100
|
||||
Subject: [PATCH] Implement deprecated player sample API
|
||||
|
@ -73,5 +73,5 @@ index cb8d0fcd..116d7c7a 100644
|
|||
@Deprecated
|
||||
public java.util.List<String> getSampleText() {
|
||||
--
|
||||
2.16.2
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 879fa631394505d943114e55e0b1f02d124b518a Mon Sep 17 00:00:00 2001
|
||||
From d87798bbc710cbdd71e22a22983fd02a5d569fc5 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 18 Mar 2018 12:28:55 -0400
|
||||
Subject: [PATCH] Player.setPlayerProfile API
|
||||
|
@ -38,5 +38,5 @@ index a882323d..87a9b750 100644
|
|||
|
||||
// Spigot start
|
||||
--
|
||||
2.16.2
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 866101379fee022401d3a461e51536c93239df50 Mon Sep 17 00:00:00 2001
|
||||
From 2f0d6d93d9cff195b35e945039d8d6fe4439c25a Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 22 Mar 2018 01:39:28 -0400
|
||||
Subject: [PATCH] getPlayerUniqueId API
|
||||
|
@ -57,5 +57,5 @@ index f2ee6516..2912bdae 100644
|
|||
* Gets the plugin manager for interfacing with plugins.
|
||||
*
|
||||
--
|
||||
2.16.2
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From d013b9ea523646c41ecb86dbd32488d25073652b Mon Sep 17 00:00:00 2001
|
||||
From b37f3ff8e0ccb80a8f8b5931561cb6b022ac4f41 Mon Sep 17 00:00:00 2001
|
||||
From: Minecrell <minecrell@minecrell.net>
|
||||
Date: Wed, 11 Oct 2017 19:30:20 +0200
|
||||
Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent
|
||||
|
@ -29,5 +29,5 @@ index 517d1523..ffda9f6a 100644
|
|||
+
|
||||
}
|
||||
--
|
||||
2.16.2
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 68549b0d344a01f477843cb2023716f2db573f32 Mon Sep 17 00:00:00 2001
|
||||
From 184976102b7c58792c87b7092f76f9ed9a4c5d4e Mon Sep 17 00:00:00 2001
|
||||
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
||||
Date: Sun, 1 Apr 2018 02:28:43 +0300
|
||||
Subject: [PATCH] Add method to open already placed sign
|
||||
|
@ -23,5 +23,5 @@ index 3939d4af..dd95773e 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.16.3
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 84c3f00cdbeec9be41433470a4b0eef250e37e91 Mon Sep 17 00:00:00 2001
|
||||
From 2b7db879b8f87e7539717559348c34dfcee58f70 Mon Sep 17 00:00:00 2001
|
||||
From: Kyle Wood <demonwav@gmail.com>
|
||||
Date: Thu, 1 Mar 2018 19:37:52 -0600
|
||||
Subject: [PATCH] Add version history to version command
|
||||
|
@ -197,5 +197,5 @@ index 044361af..c45faf4c 100644
|
|||
PluginDescriptionFile desc = plugin.getDescription();
|
||||
sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 49542a3fdb8594cc0e398a21dee2664f87d0993f Mon Sep 17 00:00:00 2001
|
||||
From 9394d915b284d6b7f933585ae4e5ce763534d877 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 28 Apr 2018 10:28:50 -0400
|
||||
Subject: [PATCH] Add Ban Methods to Player Objects
|
||||
|
@ -228,5 +228,5 @@ index 87a9b750..d874d166 100644
|
|||
/**
|
||||
* Sends an Action Bar message to the client.
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 16691e65657636278f4e967df7130d011194d5b9 Mon Sep 17 00:00:00 2001
|
||||
From 83671e59f09544a3abe88beef5ed74eb454489f9 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 30 Apr 2018 13:14:30 -0400
|
||||
Subject: [PATCH] EndermanEscapeEvent
|
|
@ -1,4 +1,4 @@
|
|||
From d530ef23afbee7ab48db7b45c2fb1942b7124d9f Mon Sep 17 00:00:00 2001
|
||||
From 76f00a1ad8252336caa315be9c246a2c45d37f0b Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 30 Apr 2018 13:29:15 -0400
|
||||
Subject: [PATCH] Enderman.teleportRandomly()
|
||||
|
@ -28,5 +28,5 @@ index f537f697..52afa6f9 100644
|
|||
* Get the id and data of the block that the Enderman is carrying.
|
||||
*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From a9922fc1a48d2fc3fa12cb8daf6427708966cbfd Mon Sep 17 00:00:00 2001
|
||||
From bca4856590062be45da5792be0600f138ec97b03 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 30 Apr 2018 17:55:28 -0400
|
||||
Subject: [PATCH] Additional world.getNearbyEntities API's
|
||||
|
@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's
|
|||
Provides more methods to get nearby entities, and filter by types and predicates
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 7687f882..c7b0bd3e 100644
|
||||
index 0bc47dd6..3b81f81e 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -2,11 +2,14 @@ package org.bukkit;
|
||||
|
@ -231,5 +231,5 @@ index 7687f882..c7b0bd3e 100644
|
|||
* Get a list of all players in this World
|
||||
*
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From b471767c119f5c816db37bd7ba3d0e845feb2792 Mon Sep 17 00:00:00 2001
|
||||
From fab29e96a141caa798cc94404c6625cee93401c8 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 30 Apr 2018 19:27:31 -0400
|
||||
Subject: [PATCH] Location.isChunkLoaded() API
|
||||
|
@ -17,5 +17,5 @@ index 5c3d42cc..1ddebf3c 100644
|
|||
public boolean equals(Object obj) {
|
||||
if (obj == null) {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 90a7290801e9df5dc6bd93909df915ffed52e875 Mon Sep 17 00:00:00 2001
|
||||
From cd6e9ca316853d3c693c8e07db6595184b79742f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 29 Aug 2017 23:58:48 -0400
|
||||
Subject: [PATCH] Expand World.spawnParticle API and add Builder
|
||||
|
@ -398,10 +398,10 @@ index 9794c13e..cc9c2c5e 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index c7b0bd3e..6fa17d98 100644
|
||||
index 3b81f81e..e7973c73 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -1791,7 +1791,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1775,7 +1775,31 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
* the type of this depends on {@link Particle#getDataType()}
|
||||
* @param <T> Type
|
||||
*/
|
|
@ -1,4 +1,4 @@
|
|||
From 153ab6b96f5bd87fe989e6e102a0c902d6de8e4d Mon Sep 17 00:00:00 2001
|
||||
From e92bcc778ef8292d527034e43d8621ce6759eb4c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 1 May 2018 20:17:44 -0400
|
||||
Subject: [PATCH] EndermanAttackPlayerEvent
|
||||
|
@ -106,5 +106,5 @@ index 00000000..55912659
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 139f2372d8b97e7903ebea6da801c9457c87256e Mon Sep 17 00:00:00 2001
|
||||
From 13d2ed50d6346f5c8eb7833dd99f7c61e8fd0b29 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 1 May 2018 21:33:35 -0400
|
||||
Subject: [PATCH] Close Plugin Class Loaders on Disable
|
|
@ -1,4 +1,4 @@
|
|||
From 4dfcc6b9a1645e9c1fa6a5581aead470c349d60f Mon Sep 17 00:00:00 2001
|
||||
From 7afba907835ff028bc6df4bbc8a61c721913e328 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 16 May 2018 20:26:16 -0400
|
||||
Subject: [PATCH] WitchConsumePotionEvent
|
||||
|
@ -115,5 +115,5 @@ index 00000000..6ef6367b
|
|||
+ }
|
||||
+}
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 03b5a5e31bb52b1eefb424ba06b975649b32dd40 Mon Sep 17 00:00:00 2001
|
||||
From 56bcd520031264156557ee37406ad31801e4615e Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 16 May 2018 20:39:09 -0400
|
||||
Subject: [PATCH] WitchThrowPotionEvent
|
||||
|
@ -79,5 +79,5 @@ index 6ef6367b..77487e28 100644
|
|||
|
||||
@Override
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From c338a85f88b3d3746f11058714d76e5a963f8847 Mon Sep 17 00:00:00 2001
|
||||
From b3a03a0fef09bf81b68cda7d9bbeca9fbe0620f8 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 24 May 2018 21:01:13 -0400
|
||||
Subject: [PATCH] Location.toBlockLocation/toCenterLocation()
|
||||
|
@ -40,5 +40,5 @@ index 1ddebf3c..916238c4 100644
|
|||
public boolean equals(Object obj) {
|
||||
if (obj == null) {
|
||||
--
|
||||
2.17.0
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From e2c45b3168b0755f4c5b7e7ec1961a43646b695d Mon Sep 17 00:00:00 2001
|
||||
From 65451a70d7b009c6be27094e4bce37b1fa9e0055 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sun, 3 Jun 2018 04:10:13 -0400
|
||||
Subject: [PATCH] PotionEffect clone methods
|
|
@ -1,4 +1,4 @@
|
|||
From 923b71da4ced8f00c0065473ee419aeb620114ef Mon Sep 17 00:00:00 2001
|
||||
From 2f1e07e1372f23f43228dfa883f7c68b3693efc0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 5 Jun 2018 22:47:08 -0400
|
||||
Subject: [PATCH] WitchReadyPotionEvent
|
|
@ -1,4 +1,4 @@
|
|||
From dca114a3fa37ef6bb99e05cce391850e6cdb0937 Mon Sep 17 00:00:00 2001
|
||||
From 6d033d644b0b4a847583ddbcfebe16d9d0dd102a Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 5 Jun 2018 22:59:50 -0400
|
||||
Subject: [PATCH] ItemStack#getMaxItemUseDuration
|
|
@ -1,4 +1,4 @@
|
|||
From e3bebcf4cbf12c0cd7c2c3627dfd87b53837a408 Mon Sep 17 00:00:00 2001
|
||||
From 68c89dbfd099490e99b0c394d263cb6f7ca05c7e Mon Sep 17 00:00:00 2001
|
||||
From: Shane Freeder <theboyetronic@gmail.com>
|
||||
Date: Sat, 9 Jun 2018 13:08:21 +0100
|
||||
Subject: [PATCH] Add EntityTeleportEndGatewayEvent
|
|
@ -1,4 +1,4 @@
|
|||
From 7c17fe406f21ecc522cc1a3a1b1d86babcdf66ff Mon Sep 17 00:00:00 2001
|
||||
From e124bd2d2d8f8626100e4fcf953969bdc22a4059 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 16 Jun 2018 13:41:00 -0400
|
||||
Subject: [PATCH] Add SentientNPC Interface to Entities
|
|
@ -1,4 +1,4 @@
|
|||
From a6ab787c5dd9cc0681087bfb35ae3b837dc4683a Mon Sep 17 00:00:00 2001
|
||||
From cfe3f366cacec9477b3f69fdf9da3e70c11d1b09 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sat, 16 Jun 2018 01:17:39 -0500
|
||||
Subject: [PATCH] Make shield blocking delay configurable
|
|
@ -1,4 +1,4 @@
|
|||
From 22e607d260ece86555749a52e0538f14c5089aef Mon Sep 17 00:00:00 2001
|
||||
From 700930b99045dbef4f1c65e7edda7d67edb3680c Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Sat, 15 Jun 2013 19:52:04 -0400
|
||||
Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
|
|
@ -1,4 +1,4 @@
|
|||
From 9594f7339a5e2a481ebd29479afbd474209ee66b Mon Sep 17 00:00:00 2001
|
||||
From 8dae21e28f695e73fa04d18e1bdc00d2436cbf22 Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Mon, 18 Jun 2018 00:41:46 -0500
|
||||
Subject: [PATCH] Add "getNearbyXXX" methods to Location
|
||||
|
@ -220,5 +220,5 @@ index 916238c4..c1689168 100644
|
|||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
--
|
||||
2.11.0
|
||||
2.17.1
|
||||
|
203
Spigot-API-Patches/0117-Expand-Explosions-API.patch
Normal file
203
Spigot-API-Patches/0117-Expand-Explosions-API.patch
Normal file
|
@ -0,0 +1,203 @@
|
|||
From ffb6892f7c3065b74096bed892df7da3bfe4dbeb 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 c1689168..d0d86e1a 100644
|
||||
--- a/src/main/java/org/bukkit/Location.java
|
||||
+++ b/src/main/java/org/bukkit/Location.java
|
||||
@@ -711,6 +711,84 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
return world.getNearbyEntitiesByType(clazz, this, xRadius, yRadius, zRadius, predicate);
|
||||
}
|
||||
+
|
||||
+ /**
|
||||
+ * 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 world.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 world.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 world.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 power The power of explosion, where 4F is TNT
|
||||
+ * @return false if explosion was canceled, otherwise true
|
||||
+ */
|
||||
+ public boolean createExplosion(Entity source, float power) {
|
||||
+ return world.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 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(Entity source, float power, boolean setFire) {
|
||||
+ return world.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 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(Entity source, float power, boolean setFire, boolean breakBlocks) {
|
||||
+ return world.createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
|
||||
+ }
|
||||
// Paper end
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index e7973c73..4ed7d2dc 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -956,6 +956,99 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
*/
|
||||
public boolean createExplosion(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 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(Entity source, 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 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(Entity source, 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 power The power of explosion, where 4F is TNT
|
||||
+ * @return false if explosion was canceled, otherwise true
|
||||
+ */
|
||||
+ public default boolean createExplosion(Entity source, 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(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(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(Entity source, float power) {
|
||||
+ 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
|
||||
+ */
|
||||
+ public default boolean createExplosion(Location loc, float power, boolean setFire, boolean breakBlocks) {
|
||||
+ return createExplosion(loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks);
|
||||
+ }
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* Gets the {@link Environment} type of this world
|
||||
*
|
||||
--
|
||||
2.17.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From 733f83fe10c98a49b22aeb10cb14e882c30d1a17 Mon Sep 17 00:00:00 2001
|
||||
From 7837bc68eb1d8b4b7d8fcf494f38e2b79631ba27 Mon Sep 17 00:00:00 2001
|
||||
From: Brokkonaut <hannos17@gmx.de>
|
||||
Date: Mon, 18 Jun 2018 15:46:23 +0200
|
||||
Subject: [PATCH] Implement EntityKnockbackByEntityEvent
|
||||
|
@ -42,5 +42,5 @@ index 65bc19b17..156bf8ee0 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.16.1.windows.1
|
||||
2.17.1
|
||||
|
26
Spigot-Server-Patches/0315-Expand-Explosions-API.patch
Normal file
26
Spigot-Server-Patches/0315-Expand-Explosions-API.patch
Normal file
|
@ -0,0 +1,26 @@
|
|||
From 39522bc9355d3dc704db0aa47bc546c66f81d936 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 20 Jun 2018 23:17:24 -0400
|
||||
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/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index e88846bb5..e2da30d88 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -579,6 +579,11 @@ public class CraftWorld implements World {
|
||||
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
|
||||
return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
|
||||
}
|
||||
+ // Paper start
|
||||
+ public boolean createExplosion(Entity source, Location loc, float power, boolean setFire, boolean breakBlocks) {
|
||||
+ return !world.createExplosion(source != null ? ((CraftEntity) source).getHandle() : null, loc.getX(), loc.getY(), loc.getZ(), power, setFire, breakBlocks).wasCanceled;
|
||||
+ }
|
||||
+ // Paper end
|
||||
|
||||
public boolean createExplosion(Location loc, float power) {
|
||||
return createExplosion(loc, power, false);
|
||||
--
|
||||
2.17.1
|
||||
|
Loading…
Reference in a new issue