twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 15:42:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential for NPE if receivers is null and the world was empty

Browse Source
This commit is contained in:
Aikar
2018-06-06 21:45:30 -04:00
parent d4e763c30e
commit d72d79efee
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
new file mode 100644 new file mode 100644
index 00000000..bf4edd07 index 00000000..2bccc409
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -96,11 +96,13 @@ index 00000000..bf4edd07
+ * @return If this particle is going to be sent to someone + * @return If this particle is going to be sent to someone
+ */ + */
+ public boolean hasReceivers() { + public boolean hasReceivers() {
+ return (receivers == null && !location.getWorld().getPlayers().isEmpty()) || !receivers.isEmpty(); + return (receivers == null && !location.getWorld().getPlayers().isEmpty()) || (receivers != null && !receivers.isEmpty());
+ } + }
+ +
+ /** + /**
+ * Sends this particle to all players in the world + * Sends this particle to all players in the world. This is rather silly and you should likely not be doing this.
+ *
+ * Just be a logical person and use receivers by radius or collection.
+ */ + */
+ public ParticleBuilder allPlayers() { + public ParticleBuilder allPlayers() {
+ this.receivers = null; + this.receivers = null;