Remove potion effects from draughts on PvP/PvE

[DwarfyAssassin]

Currently there is a flaw with the draught blocking system in PvP and PvE combat. You can't drink them during the fight but you're able to drink them before the fight and keep the potion effect during the fight.
A solution would be to remove all potion effects at the start of the fight but that wouldn't be good as the potion effects might come from another source then draughts.

So the solution which I propose is to keep track which draught a player drank and how long it's potion effects are going to last for. When in combat it would check if the player has potion effects and if so if their end time and type correspond with the effect from the draughts. If it matches you could remove the potion effect from that player (and maybe give it back once they are out of combat).

This probably still has a few flaws but I think it would be better then the current system.