Repo-Mirror/EcoMobs
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoMobs.git synced 2025-12-21 16:09:24 +00:00
Code Issues Releases 1 Activity

Refactored LivingEcoBoss

Browse Source
This commit is contained in:
Auxilor
2021-04-01 11:35:34 +01:00
parent 4bc55cc818
commit 5356d9410c
2 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
View File

@@ -281,6 +281,7 @@ public class EcoBoss extends PluginDependent {
ItemStack itemStack = tempConfig.getItemStack("drop-key"); ItemStack itemStack = tempConfig.getItemStack("drop-key");
this.drops.put(itemStack, chance); this.drops.put(itemStack, chance);
} }
this.experienceOptions = new ExperienceOptions( this.experienceOptions = new ExperienceOptions(
this.getConfig().getInt("rewards.xp.minimum"), this.getConfig().getInt("rewards.xp.minimum"),
this.getConfig().getInt("rewards.xp.maximum") this.getConfig().getInt("rewards.xp.maximum")

105
eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
View File

@@ -66,7 +66,6 @@ public class LivingEcoBoss extends PluginDependent {
this.onSpawn(); this.onSpawn();
// Tickers // Tickers
this.tickers = new HashSet<>(); this.tickers = new HashSet<>();
this.tickers.add(new HealthPlaceholderTicker()); this.tickers.add(new HealthPlaceholderTicker());
@@ -91,58 +90,6 @@ public class LivingEcoBoss extends PluginDependent {
}).runTaskTimer(0, 1); }).runTaskTimer(0, 1);
} }
/**
* Handle an attack to the player.
*
* @param player The player.
*/
public void handleAttack(@NotNull final Player player) {
for (OptionedSound sound : boss.getInjureSounds()) {
player.getWorld().playSound(entity.getLocation(), sound.getSound(), sound.getVolume(), sound.getPitch());
}
for (EffectOption effect : boss.getEffects()) {
if (NumberUtils.randFloat(0, 100) > effect.getChance()) {
continue;
}
player.addPotionEffect(new PotionEffect(effect.getEffectType(), effect.getDuration(), effect.getLevel()));
}
if (NumberUtils.randFloat(0, 100) < boss.getShuffleChance()) {
List<ItemStack> hotbar = new ArrayList<>();
for (int i = 0; i < 9; i++) {
hotbar.add(player.getInventory().getItem(i));
}
Collections.shuffle(hotbar);
int i2 = 0;
for (ItemStack item : hotbar) {
player.getInventory().setItem(i2, item);
i2++;
}
player.playSound(player.getLocation(), Sound.ENTITY_ENDER_PEARL_THROW, 1, 0.5f);
}
for (SummonsOption summon : boss.getSummons()) {
if (NumberUtils.randFloat(0, 100) > summon.getChance()) {
continue;
}
Location loc = player.getLocation().add(NumberUtils.randInt(2, 6), 0, NumberUtils.randInt(2, 6));
while (!loc.getBlock().getType().equals(Material.AIR)) {
loc.add(0, 1, 0);
}
Entity summonedEntity = player.getWorld().spawnEntity(loc, summon.getType());
if (summonedEntity instanceof Mob) {
((Mob) summonedEntity).setTarget(player);
}
for (OptionedSound sound : boss.getSummonSounds()) {
player.getWorld().playSound(entity.getLocation(), sound.getSound(), sound.getVolume(), sound.getPitch());
}
}
}
private void onSpawn() { private void onSpawn() {
entity.getPersistentDataContainer().set(this.getPlugin().getNamespacedKeyFactory().create("boss"), PersistentDataType.STRING, boss.getName()); entity.getPersistentDataContainer().set(this.getPlugin().getNamespacedKeyFactory().create("boss"), PersistentDataType.STRING, boss.getName());
entity.setPersistent(true); entity.setPersistent(true);
@@ -196,4 +143,56 @@ public class LivingEcoBoss extends PluginDependent {
boss.removeLivingBoss(entity.getUniqueId()); boss.removeLivingBoss(entity.getUniqueId());
} }
} }
/**
* Handle an attack to the player.
*
* @param player The player.
*/
public void handleAttack(@NotNull final Player player) {
for (OptionedSound sound : boss.getInjureSounds()) {
player.getWorld().playSound(entity.getLocation(), sound.getSound(), sound.getVolume(), sound.getPitch());
}
for (EffectOption effect : boss.getEffects()) {
if (NumberUtils.randFloat(0, 100) > effect.getChance()) {
continue;
}
player.addPotionEffect(new PotionEffect(effect.getEffectType(), effect.getDuration(), effect.getLevel()));
}
if (NumberUtils.randFloat(0, 100) < boss.getShuffleChance()) {
List<ItemStack> hotbar = new ArrayList<>();
for (int i = 0; i < 9; i++) {
hotbar.add(player.getInventory().getItem(i));
}
Collections.shuffle(hotbar);
int i2 = 0;
for (ItemStack item : hotbar) {
player.getInventory().setItem(i2, item);
i2++;
}
player.playSound(player.getLocation(), Sound.ENTITY_ENDER_PEARL_THROW, 1, 0.5f);
}
for (SummonsOption summon : boss.getSummons()) {
if (NumberUtils.randFloat(0, 100) > summon.getChance()) {
continue;
}
Location loc = player.getLocation().add(NumberUtils.randInt(2, 6), 0, NumberUtils.randInt(2, 6));
while (!loc.getBlock().getType().equals(Material.AIR)) {
loc.add(0, 1, 0);
}
Entity summonedEntity = player.getWorld().spawnEntity(loc, summon.getType());
if (summonedEntity instanceof Mob) {
((Mob) summonedEntity).setTarget(player);
}
for (OptionedSound sound : boss.getSummonSounds()) {
player.getWorld().playSound(entity.getLocation(), sound.getSound(), sound.getVolume(), sound.getPitch());
}
}
}
} }