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

Merge branch 'development'

Browse Source
This commit is contained in:
Christian Koop 2021-11-19 23:22:39 +01:00
commit 00963c6e92
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>EpicHoppers</artifactId> <artifactId>EpicHoppers</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>4.6.23</version> <version>4.6.24</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>EpicHoppers-${project.version}</finalName> <finalName>EpicHoppers-${project.version}</finalName>
@ -100,18 +100,13 @@
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<version>1.17</version> <version>1.17</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>skyblock</artifactId> <artifactId>skyblock</artifactId>
<version>2.2.13</version> <version>2.3.30</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
@ -126,9 +121,10 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.brcdev</groupId> <groupId>com.github.brcdev-minecraft</groupId>
<artifactId>ShopGUIPlus</artifactId> <artifactId>shopgui-api</artifactId>
<version>1.19.5</version> <version>2.2.0</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>

7
src/main/java/com/songoda/epichoppers/hopper/Hopper.java
View File

@ -125,8 +125,11 @@ public class Hopper {
} }
Location loc = location.clone().add(.5, .5, .5); Location loc = location.clone().add(.5, .5, .5);
CompatibleParticleHandler.spawnParticles(CompatibleParticleHandler.ParticleType.getParticle(Settings.UPGRADE_PARTICLE_TYPE.getString()), if (!Settings.UPGRADE_PARTICLE_TYPE.getString().trim().isEmpty()) {
loc, 100, .5, .5, .5); CompatibleParticleHandler.spawnParticles(
CompatibleParticleHandler.ParticleType.getParticle(Settings.UPGRADE_PARTICLE_TYPE.getString()),
loc, 100, .5, .5, .5);
}
if (plugin.getLevelManager().getHighestLevel() != level) { if (plugin.getLevelManager().getHighestLevel() != level) {
player.playSound(player.getLocation(), CompatibleSound.ENTITY_PLAYER_LEVELUP.getSound(), 0.6F, 15.0F); player.playSound(player.getLocation(), CompatibleSound.ENTITY_PLAYER_LEVELUP.getSound(), 0.6F, 15.0F);

16
src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
View File

@ -92,14 +92,18 @@ public class ModuleBlockBreak extends Module {
float yy = (float) (0 + (Math.random() * .5)); float yy = (float) (0 + (Math.random() * .5));
float zz = (float) (0 + (Math.random() * .5)); float zz = (float) (0 + (Math.random() * .5));
Particle particle; Particle particle = null;
try { if (!Settings.BLOCKBREAK_PARTICLE.getString().trim().isEmpty()) {
particle = Particle.valueOf(Settings.BLOCKBREAK_PARTICLE.getString()); try {
} catch (Exception e) { particle = Particle.valueOf(Settings.BLOCKBREAK_PARTICLE.getString());
particle = Particle.LAVA; } catch (Exception ignore) {
particle = Particle.LAVA;
}
} }
above.getWorld().spawnParticle(particle, locationAbove, 15, xx, yy, zz); if (particle != null) {
above.getWorld().spawnParticle(particle, locationAbove, 15, xx, yy, zz);
}
} }
boolean waterlogged = false; boolean waterlogged = false;