mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Merge pull request #1149 from J3fftw1/master
Changed values of sound decaying
This commit is contained in:
commit
2c9445a971
@ -82,7 +82,7 @@ public final class TeleportationSequence {
|
|||||||
}
|
}
|
||||||
|
|
||||||
destination.getWorld().spawnParticle(Particle.PORTAL,new Location(destination.getWorld(), destination.getX(), destination.getY() + 1, destination.getZ()),progress * 2, 0.2F, 0.8F, 0.2F );
|
destination.getWorld().spawnParticle(Particle.PORTAL,new Location(destination.getWorld(), destination.getX(), destination.getY() + 1, destination.getZ()),progress * 2, 0.2F, 0.8F, 0.2F );
|
||||||
destination.getWorld().playSound(destination, Sound.ENTITY_BLAZE_DEATH, 2F, 1.4F);
|
destination.getWorld().playSound(destination, Sound.ENTITY_BLAZE_DEATH, 1F, 1.4F);
|
||||||
SlimefunPlugin.getUtilities().teleporterUsers.remove(uuid);
|
SlimefunPlugin.getUtilities().teleporterUsers.remove(uuid);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -93,7 +93,7 @@ public final class TeleportationSequence {
|
|||||||
subtitle.send(TitleType.SUBTITLE, p);
|
subtitle.send(TitleType.SUBTITLE, p);
|
||||||
|
|
||||||
source.getWorld().spawnParticle(Particle.PORTAL, source, progress * 2, 0.2F, 0.8F, 0.2F);
|
source.getWorld().spawnParticle(Particle.PORTAL, source, progress * 2, 0.2F, 0.8F, 0.2F);
|
||||||
source.getWorld().playSound(source, Sound.UI_BUTTON_CLICK, 1.7F, 0.6F);
|
source.getWorld().playSound(source, Sound.UI_BUTTON_CLICK, 1F, 0.6F);
|
||||||
|
|
||||||
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L);
|
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L);
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ public class InfusedHopper extends SimpleSlimefunItem<BlockTicker> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (sound) {
|
if (sound) {
|
||||||
b.getWorld().playSound(b.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 5F, 2F);
|
b.getWorld().playSound(b.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1F, 2F);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ public class MagnetTask extends SlimefunTask {
|
|||||||
for (Entity item: Bukkit.getPlayer(uuid).getNearbyEntities(6D, 6D, 6D)) {
|
for (Entity item: Bukkit.getPlayer(uuid).getNearbyEntities(6D, 6D, 6D)) {
|
||||||
if (item instanceof Item && !item.hasMetadata("no_pickup") && ((Item) item).getPickupDelay() <= 0) {
|
if (item instanceof Item && !item.hasMetadata("no_pickup") && ((Item) item).getPickupDelay() <= 0) {
|
||||||
item.teleport(Bukkit.getPlayer(uuid).getEyeLocation());
|
item.teleport(Bukkit.getPlayer(uuid).getEyeLocation());
|
||||||
Bukkit.getPlayer(uuid).getWorld().playSound(Bukkit.getPlayer(uuid).getEyeLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 5L, 2L);
|
Bukkit.getPlayer(uuid).getWorld().playSound(Bukkit.getPlayer(uuid).getEyeLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1F, 2F);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -110,7 +110,7 @@ public class RitualAnimation implements Runnable {
|
|||||||
else {
|
else {
|
||||||
particles.add(pedestal.getLocation().add(0.5, 1.5, 0.5));
|
particles.add(pedestal.getLocation().add(0.5, 1.5, 0.5));
|
||||||
items.add(AncientAltarListener.fixItemStack(item.getItemStack(), item.getCustomName()));
|
items.add(AncientAltarListener.fixItemStack(item.getItemStack(), item.getCustomName()));
|
||||||
pedestal.getWorld().playSound(pedestal.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 5F, 2F);
|
pedestal.getWorld().playSound(pedestal.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1F, 2F);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE,pedestal.getLocation().add(0.5, 1.5, 0.5),16, 0.3F, 0.2F, 0.3F);
|
l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE,pedestal.getLocation().add(0.5, 1.5, 0.5),16, 0.3F, 0.2F, 0.3F);
|
||||||
@ -132,7 +132,7 @@ public class RitualAnimation implements Runnable {
|
|||||||
|
|
||||||
// This should re-enable altar blocks on craft failure.
|
// This should re-enable altar blocks on craft failure.
|
||||||
utilities.altarinuse.remove(altar.getLocation());
|
utilities.altarinuse.remove(altar.getLocation());
|
||||||
l.getWorld().playSound(l, Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 5F, 1F);
|
l.getWorld().playSound(l, Sound.ENTITY_ZOMBIE_ATTACK_IRON_DOOR, 1F, 1F);
|
||||||
itemLock.clear();
|
itemLock.clear();
|
||||||
altars.remove(altar);
|
altars.remove(altar);
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ public class ArmorListener implements Listener {
|
|||||||
&& e.getCause() == DamageCause.FALL
|
&& e.getCause() == DamageCause.FALL
|
||||||
) {
|
) {
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_BREAK_WOODEN_DOOR, 2F, 2F);
|
p.getWorld().playSound(p.getLocation(), Sound.ENTITY_ZOMBIE_BREAK_WOODEN_DOOR, 1F, 2F);
|
||||||
p.setVelocity(new Vector(0.0, 0.7, 0.0));
|
p.setVelocity(new Vector(0.0, 0.7, 0.0));
|
||||||
for (Entity n: p.getNearbyEntities(4, 4, 4)) {
|
for (Entity n: p.getNearbyEntities(4, 4, 4)) {
|
||||||
if (n instanceof LivingEntity && !n.getUniqueId().equals(p.getUniqueId())) {
|
if (n instanceof LivingEntity && !n.getUniqueId().equals(p.getUniqueId())) {
|
||||||
|
Loading…
Reference in New Issue
Block a user