Rearrange some probably problematic code in Flight

This commit is contained in:
zontreck 2024-04-01 20:31:24 -07:00
parent 9ca97962fa
commit 0ef217fe44

View file

@ -59,47 +59,38 @@ public class FlightEnchantment extends Enchantment
} }
public static AtomicInteger TICKS = new AtomicInteger(0);
public static void runEntityTick(ServerPlayer sp) public static void runEntityTick(ServerPlayer sp)
{ {
if(ServerUtilities.isClient()) return; if(ServerUtilities.isClient()) return;
if(TICKS.getAndIncrement() >= 20)
if(ServerConfig.general.debug)
{ {
TICKS.set(0); OTEMod.LOGGER.info("> Flight Enchantment Tick <");
if(ServerConfig.general.debug)
{
OTEMod.LOGGER.info("> Flight Enchantment Tick <");
}
ItemStack feet = sp.getItemBySlot(EquipmentSlot.FEET);
boolean hasFlight = false;
if(ItemUtils.getEnchantmentLevel(ModEnchantments.FLIGHT_ENCHANTMENT.get(), feet)>0)hasFlight=true;
if(hasFlight)
{
MobEffectInstance inst = new MobEffectInstance(ModEffects.FLIGHT.get(), 60*20, 0, false, false, true);
MobEffectInstance existing = sp.getEffect(ModEffects.FLIGHT.get());
if(existing != null)
{
if(existing.getDuration() <= (30 * 20))
{
sp.addEffect(inst);
return;
}else return;
}
sp.addEffect(inst);
}
} }
ItemStack feet = sp.getItemBySlot(EquipmentSlot.FEET);
boolean hasFlight = false;
if(ItemUtils.getEnchantmentLevel(ModEnchantments.FLIGHT_ENCHANTMENT.get(), feet)>0)hasFlight=true;
if(hasFlight)
{
MobEffectInstance inst = new MobEffectInstance(ModEffects.FLIGHT.get(), 60*20, 0, false, false, true);
MobEffectInstance existing = sp.getEffect(ModEffects.FLIGHT.get());
if(existing != null)
{
if(existing.getDuration() <= (30 * 20))
{
sp.addEffect(inst);
return;
}else return;
}
sp.addEffect(inst);
}
} }