From c07feccffa65efcd4c0450bc093c1e7e0d3c519a Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 8 Feb 2019 03:00:02 +0000 Subject: [PATCH] Also use a task for MaxCp effect heal. --- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- .../handlers/effecthandlers/MaxCp.java | 24 +++++++++++-------- 10 files changed, 140 insertions(+), 100 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index f8c2510bda..624c3a296b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -16,6 +16,7 @@ */ package handlers.effecthandlers; +import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; @@ -41,19 +42,22 @@ public class MaxCp extends AbstractStatEffect { if (_heal) { - switch (_mode) + ThreadPool.schedule(() -> { - case DIFF: // DIFF + switch (_mode) { - effected.setCurrentCp(effected.getCurrentCp() + _amount); - break; + case DIFF: + { + effected.setCurrentCp(effected.getCurrentCp() + _amount); + break; + } + case PER: + { + effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); + break; + } } - case PER: // PER - { - effected.setCurrentCp(effected.getCurrentCp() + (effected.getMaxCp() * (_amount / 100))); - break; - } - } + }, 100); } } }