TotalFreedomMC/PlayerParticles
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/PlayerParticles.git synced 2025-02-20 15:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Limit particle display range

Browse source 
Particles previously were displayed to all players in the entire world,
now they only display to players within 192 blocks of the particle spawn
location.
This commit is contained in:
Esophose 2018-03-01 02:36:37 -07:00
parent 5dc0cd7bb2
commit 1f24740e0a
2 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pom.xml
View file

@ -44,7 +44,7 @@
</includes>
</artifactSet>
<filters>
<filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
@ -52,7 +52,7 @@
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</filters>
<outputFile>C:\Users\Esophose\Desktop\1.12.2 Dev Server\plugins\update\PlayerParticles v5.jar</outputFile>
</configuration>
</execution>
@ -77,15 +77,15 @@
<artifactId>slf4j-nop</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

38
src/com/esophose/playerparticles/particles/ParticleEffect.java
View file

@ -7,9 +7,11 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.MaterialData;
@ -96,7 +98,8 @@ public enum ParticleEffect {
FALLING_DUST("fallingdust", "FALLING_DUST", ParticleProperty.REQUIRES_DATA),
TOTEM("totem", "TOTEM"),
SPIT("spit", "SPIT");
private static final int PARTICLE_DISPLAY_RANGE_SQUARED = 36864; // (12 chunks * 16 blocks per chunk)^2
private static final Map<String, ParticleEffect> NAME_MAP = new HashMap<String, ParticleEffect>();
private static final Map<Integer, ParticleEffect> ID_MAP = new HashMap<Integer, ParticleEffect>();
private final String name;
@ -261,7 +264,9 @@ public enum ParticleEffect {
if (hasProperty(ParticleProperty.REQUIRES_DATA)) {
throw new ParticleDataException("This particle effect requires additional data");
}
center.getWorld().spawnParticle(spigotEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed);
for (Player player : getPlayersInRange(center))
player.spawnParticle(spigotEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed);
}
/**
@ -278,8 +283,10 @@ public enum ParticleEffect {
if (!isColorCorrect(this, color)) {
throw new ParticleColorException("The particle color type is incorrect");
}
// Minecraft clients require that you pass Float.MIN_VALUE if the Red value is 0
center.getWorld().spawnParticle(spigotEnum, center.getX(), center.getY(), center.getZ(), 0, this == ParticleEffect.RED_DUST && color.getValueX() == 0 ? Float.MIN_VALUE : color.getValueX(), color.getValueY(), color.getValueZ(), 1);
for (Player player : getPlayersInRange(center))
// Minecraft clients require that you pass Float.MIN_VALUE if the Red value is 0
player.spawnParticle(spigotEnum, center.getX(), center.getY(), center.getZ(), 0, this == ParticleEffect.RED_DUST && color.getValueX() == 0 ? Float.MIN_VALUE : color.getValueX(), color.getValueY(), color.getValueZ(), 1);
}
/**
@ -313,7 +320,28 @@ public enum ParticleEffect {
extraData = null;
System.out.println(spigotEnum.getDataType().getName());
}
center.getWorld().spawnParticle(spigotEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed, extraData);
for (Player player : getPlayersInRange(center))
player.spawnParticle(spigotEnum, center.getX(), center.getY(), center.getZ(), amount, offsetX, offsetY, offsetZ, speed, extraData);
}
/**
* Gets a List<Player> of players within the particle display range
*
* @param center The center of the radius to check around
* @return A List<Player> of the players within the particle display range
*/
private List<Player> getPlayersInRange(Location center) {
List<Player> players = new ArrayList<Player>();
for (Player p : Bukkit.getOnlinePlayers()) {
if (!p.getWorld().equals(center.getWorld())) continue;
if (center.distanceSquared(p.getLocation()) <= PARTICLE_DISPLAY_RANGE_SQUARED) {
players.add(p);
}
}
return players;
}
/**