mirror of
https://github.com/Minestom/Minestom.git
synced 2025-01-03 23:17:48 +01:00
Merge branch 'master' into acquirable
This commit is contained in:
commit
db2550f9ab
@ -683,7 +683,7 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
|
|||||||
callEvent(EntityTickEvent.class, tickEvent); // reuse tickEvent to avoid recreating it each tick
|
callEvent(EntityTickEvent.class, tickEvent); // reuse tickEvent to avoid recreating it each tick
|
||||||
|
|
||||||
// remove expired effects
|
// remove expired effects
|
||||||
{
|
if (!effects.isEmpty()) {
|
||||||
this.effects.removeIf(timedPotion -> {
|
this.effects.removeIf(timedPotion -> {
|
||||||
final long potionTime = (long) timedPotion.getPotion().getDuration() * MinecraftServer.TICK_MS;
|
final long potionTime = (long) timedPotion.getPotion().getDuration() * MinecraftServer.TICK_MS;
|
||||||
// Remove if the potion should be expired
|
// Remove if the potion should be expired
|
||||||
|
Loading…
Reference in New Issue
Block a user