Merge branch 'development'

This commit is contained in:
Brianna 2020-05-14 13:52:54 -04:00
commit f54394e174
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "SongodaCore" name: "SongodaCore"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.3.31" version: "2.3.32"
build: build:
stage: build stage: build

View File

@ -234,9 +234,9 @@ public class CompatibleParticleHandler {
*/ */
public static void redstoneParticles(Location location, int red, int green, int blue, float size, int count, float radius) { public static void redstoneParticles(Location location, int red, int green, int blue, float size, int count, float radius) {
if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) {
float xx = (float) (0 + (Math.random() * 1)); float xx = (float) (radius * (Math.random() - Math.random()));
float yy = (float) (0 + (Math.random() * 1)); float yy = (float) (radius * (Math.random() - Math.random()));
float zz = (float) (0 + (Math.random() * 1)); float zz = (float) (radius * (Math.random() - Math.random()));
location.getWorld().spawnParticle(Particle.REDSTONE, location, count, xx, yy, zz, 1, new Particle.DustOptions(Color.fromBGR(blue, green, red), size)); location.getWorld().spawnParticle(Particle.REDSTONE, location, count, xx, yy, zz, 1, new Particle.DustOptions(Color.fromBGR(blue, green, red), size));
} else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)) { } else if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {