Skip to content
Permalink
Browse files

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

  • Loading branch information...
aikar committed Jun 7, 2018
1 parent d4dffd1 commit 72c26039ebdc88b8deeff135cd81089eab7a58f8
Showing with 7 additions and 5 deletions.
  1. +7 −5 Spigot-API-Patches/0102-Expand-World.spawnParticle-API-and-add-Builder.patch
@@ -1,4 +1,4 @@
From 6583e28c44eaa9d3a5f6fa225e4dafa82d2aa95e Mon Sep 17 00:00:00 2001
From 90a7290801e9df5dc6bd93909df915ffed52e875 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
@@ -10,10 +10,10 @@ 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
new file mode 100644
index 00000000..bf4edd07
index 00000000..2bccc409
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java
@@ -0,0 +1,363 @@
@@ -0,0 +1,365 @@
+package com.destroystokyo.paper;
+
+import com.google.common.collect.Lists;
@@ -96,11 +96,13 @@ index 00000000..bf4edd07
+ * @return If this particle is going to be sent to someone
+ */
+ 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() {
+ this.receivers = null;

0 comments on commit 72c2603

Please sign in to comment.
You can’t perform that action at this time.