Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-11-25 11:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-05-19 01:35:38 -04:00
commit d3062ce205
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -45,11 +45,11 @@
<!--Songoda Repo--> <!--Songoda Repo-->
<repository> <repository>
<id>songoda-public</id> <id>songoda-public</id>
<url>http://jenkins.songoda.com:8081/repository/songoda-public/</url> <url>http://repo.songoda.com/repository/songoda-public/</url>
</repository> </repository>
<repository> <repository>
<id>songoda-private</id> <id>songoda-private</id>
<url>http://jenkins.songoda.com:8081/repository/songoda-private/</url> <url>http://repo.songoda.com/repository/songoda-private/</url>
</repository> </repository>
<!--WorldGuard Repo--> <!--WorldGuard Repo-->
<repository> <repository>

1
src/main/java/com/songoda/epichoppers/EpicHoppers.java
View File

@ -27,6 +27,7 @@ public final class EpicHoppers extends JavaPlugin implements Listener {
public static CommandSender console = Bukkit.getConsoleSender(); public static CommandSender console = Bukkit.getConsoleSender();
public boolean v1_12 = Bukkit.getServer().getClass().getPackage().getName().contains("1_12"); public boolean v1_12 = Bukkit.getServer().getClass().getPackage().getName().contains("1_12");
public boolean v1_11 = Bukkit.getServer().getClass().getPackage().getName().contains("1_11");
public boolean v1_10 = Bukkit.getServer().getClass().getPackage().getName().contains("1_10"); public boolean v1_10 = Bukkit.getServer().getClass().getPackage().getName().contains("1_10");
public boolean v1_9 = Bukkit.getServer().getClass().getPackage().getName().contains("1_9"); public boolean v1_9 = Bukkit.getServer().getClass().getPackage().getName().contains("1_9");
public boolean v1_7 = Bukkit.getServer().getClass().getPackage().getName().contains("1_7"); public boolean v1_7 = Bukkit.getServer().getClass().getPackage().getName().contains("1_7");

20
src/main/java/com/songoda/epichoppers/Hopper/Hopper.java
View File

@ -5,10 +5,7 @@ import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.Utils.Debugger; import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods; import com.songoda.epichoppers.Utils.Methods;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import org.bukkit.Bukkit; import org.bukkit.*;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
@ -409,16 +406,17 @@ public class Hopper {
if (instance.getConfig().getBoolean("Main.Sounds Enabled")) { if (instance.getConfig().getBoolean("Main.Sounds Enabled")) {
if (instance.getLevelManager().getHighestLevel() != level) { if (instance.getLevelManager().getHighestLevel() != level) {
if (!instance.v1_8 && !instance.v1_7) { if (!instance.v1_8 && !instance.v1_7) {
player.playSound(player.getLocation(), org.bukkit.Sound.ENTITY_PLAYER_LEVELUP, 0.6F, 15.0F); player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 0.6F, 15.0F);
} else { } else {
player.playSound(player.getLocation(), org.bukkit.Sound.valueOf("LEVEL_UP"), 2F, 15.0F); player.playSound(player.getLocation(), Sound.valueOf("LEVEL_UP"), 2F, 15.0F);
} }
} else { } else {
if (!instance.v1_10 && !instance.v1_9 && !instance.v1_8 && !instance.v1_7) { if (!instance.v1_11 && !instance.v1_10 && !instance.v1_9 && !instance.v1_8 && !instance.v1_7) {
player.playSound(player.getLocation(), org.bukkit.Sound.ENTITY_PLAYER_LEVELUP, 2F, 25.0F); player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 2F, 25.0F);
player.playSound(player.getLocation(), org.bukkit.Sound.BLOCK_NOTE_CHIME, 2F, 25.0F);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.playSound(player.getLocation(), org.bukkit.Sound.BLOCK_NOTE_CHIME, 1.2F, 35.0F), 5L); player.playSound(player.getLocation(), Sound.BLOCK_NOTE_CHIME, 2F, 25.0F);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.playSound(player.getLocation(), org.bukkit.Sound.BLOCK_NOTE_CHIME, 1.8F, 35.0F), 10L); Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.playSound(player.getLocation(), Sound.BLOCK_NOTE_CHIME, 1.2F, 35.0F), 5L);
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> player.playSound(player.getLocation(), Sound.BLOCK_NOTE_CHIME, 1.8F, 35.0F), 10L);
} else { } else {
player.playSound(player.getLocation(), org.bukkit.Sound.valueOf("LEVEL_UP"), 2F, 25.0F); player.playSound(player.getLocation(), org.bukkit.Sound.valueOf("LEVEL_UP"), 2F, 25.0F);
} }