MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch to a different tick event due to unpredictable behavior in enchantments

Browse source
This commit is contained in:
zontreck 2024-04-02 14:08:33 -07:00
parent 2713961cdf
commit bbda4b4787
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -48,7 +48,7 @@ mod_name=Thresholds
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=GPLv3
# The mod version. See https://semver.org/
mod_version=1201.4.040124.1700
mod_version=1201.4.040224.1407
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

19
src/main/java/dev/zontreck/otemod/enchantments/EnchantmentEvents.java
View file

@ -6,23 +6,22 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.server.ServerLifecycleHooks;
@Mod.EventBusSubscriber
public class EnchantmentEvents
{
private static int TICKS = 0;
@SubscribeEvent
public static void onServerTick(TickEvent.ServerTickEvent event)
public static void handleEnchantmentTicks(TickEvent.PlayerTickEvent event)
{
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
if(server.getPlayerCount() == 0) return;
if(event.side == LogicalSide.CLIENT) return;
if(TICKS >= 20)
if(event.phase == TickEvent.Phase.END)
{
for(ServerPlayer sp : server.getPlayerList().getPlayers())
if(event.player instanceof ServerPlayer sp)
{
FlightEnchantment.runEntityTick(sp);
ConsumptionMending.onEntityTick(sp);
@ -30,10 +29,6 @@ public class EnchantmentEvents
WaterBreathingEnchantment.runEntityTick(sp);
}
TICKS=0;
}
TICKS++;
}
}
}