Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 18:27:41 +01:00
Code Issues Projects Releases Wiki Activity

Check world before checking distance. Fixes BUKKIT-1792

Browse Source 
By: Wesley Wolfe <weswolf@aol.com>
This commit is contained in:
CraftBukkit/Spigot 2012-06-12 10:59:29 -05:00
parent aae6c59efb
commit add9437bd5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -763,6 +763,9 @@ public class CraftWorld implements World {
} }
public void playEffect(Location location, Effect effect, int data, int radius) { public void playEffect(Location location, Effect effect, int data, int radius) {
Validate.notNull(location, "Location cannot be null");
Validate.notNull(effect, "Effect cannot be null");
Validate.notNull(location.getWorld(), "World cannot be null");
int packetData = effect.getId(); int packetData = effect.getId();
Packet61WorldEvent packet = new Packet61WorldEvent(packetData, location.getBlockX(), location.getBlockY(), location.getBlockZ(), data); Packet61WorldEvent packet = new Packet61WorldEvent(packetData, location.getBlockX(), location.getBlockY(), location.getBlockZ(), data);
int distance; int distance;
@ -770,6 +773,7 @@ public class CraftWorld implements World {
for (Player player : getPlayers()) { for (Player player : getPlayers()) {
if (((CraftPlayer) player).getHandle().netServerHandler == null) continue; if (((CraftPlayer) player).getHandle().netServerHandler == null) continue;
if (!location.getWorld().equals(player.getWorld())) continue;
distance = (int) player.getLocation().distanceSquared(location); distance = (int) player.getLocation().distanceSquared(location);
if (distance <= radius) { if (distance <= radius) {