Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-01-11 23:00:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated to eco 5.5.1

Browse Source
This commit is contained in:
Auxilor 2021-06-22 09:46:30 +01:00
parent 94460015e7
commit b0e7131111
2 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -48,7 +48,7 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:5.4.1'
compileOnly 'com.willfp:eco:5.5.1'
compileOnly 'org.jetbrains:annotations:19.0.0'

62
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java
View File

@ -1,10 +1,10 @@
package com.willfp.ecoenchants.enchantments.util;
import com.google.common.collect.Sets;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.core.config.ConfigUpdater;
import com.willfp.eco.core.events.ArmorEquipEvent;
import com.willfp.eco.core.events.PlayerJumpEvent;
import com.willfp.eco.core.integrations.antigrief.AntigriefManager;
import com.willfp.eco.core.integrations.mcmmo.McmmoManager;
import com.willfp.eco.util.TridentUtils;
@ -29,28 +29,12 @@ import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffectType;
import org.jetbrains.annotations.NotNull;
import java.text.DecimalFormat;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@SuppressWarnings("deprecation")
public class WatcherTriggers extends PluginDependent implements Listener {
/**
* For jump listeners.
*/
private static final Set<UUID> PREVIOUS_PLAYERS_ON_GROUND = Sets.newHashSet();
/**
* For jump listeners.
*/
private static final DecimalFormat FORMAT = new DecimalFormat("0.00");
/**
* If watchers should be triggered against npcs.
*/
@ -197,44 +181,28 @@ public class WatcherTriggers extends PluginDependent implements Listener {
* @param event The event to listen for.
*/
@EventHandler(ignoreCancelled = true)
public void onJump(@NotNull final PlayerMoveEvent event) {
public void onJump(@NotNull final PlayerJumpEvent event) {
if (McmmoManager.isFake(event)) {
return;
}
Player player = event.getPlayer();
if (player.getVelocity().getY() > 0) {
float jumpVelocity = 0.42f;
if (player.hasPotionEffect(PotionEffectType.JUMP)) {
jumpVelocity += ((float) player.getPotionEffect(PotionEffectType.JUMP).getAmplifier() + 1) * 0.1F;
EnchantChecks.getEnchantsOnArmor(player).forEach((enchant, level) -> {
if (event.isCancelled()) {
return;
}
jumpVelocity = Float.parseFloat(FORMAT.format(jumpVelocity).replace(',', '.'));
if (event.getPlayer().getLocation().getBlock().getType() != Material.LADDER
&& PREVIOUS_PLAYERS_ON_GROUND.contains(player.getUniqueId())
&& !player.isOnGround()
&& Float.compare((float) player.getVelocity().getY(), jumpVelocity) == 0) {
EnchantChecks.getEnchantsOnArmor(player).forEach((enchant, level) -> {
if (event.isCancelled()) {
return;
}
if (!enchant.isEnabled()) {
return;
}
if (enchant.getDisabledWorlds().contains(player.getWorld())) {
return;
}
enchant.onJump(player, level, event);
});
if (!enchant.isEnabled()) {
return;
}
}
if (player.isOnGround()) {
PREVIOUS_PLAYERS_ON_GROUND.add(player.getUniqueId());
} else {
PREVIOUS_PLAYERS_ON_GROUND.remove(player.getUniqueId());
}
if (enchant.getDisabledWorlds().contains(player.getWorld())) {
return;
}
enchant.onJump(player, level, event);
});
}
/**