From 46eed8684392ce5c50ce5a09624a0d136c264f05 Mon Sep 17 00:00:00 2001 From: Zealar <zealar@mail.bg> Date: Sat, 19 Dec 2015 12:10:03 +0200 Subject: [PATCH] Servitor Share few problems solved, Fix #267 --- .../scripts/handlers/effecthandlers/ServitorShare.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java b/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java index fb2a6eb127..bea452f976 100644 --- a/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java +++ b/dist/game/data/scripts/handlers/effecthandlers/ServitorShare.java @@ -54,6 +54,7 @@ public final class ServitorShare extends AbstractEffect if (info.getEffected().getActingPlayer().getSummon() != null) { info.getEffected().getActingPlayer().getSummon().broadcastInfo(); + info.getEffected().getActingPlayer().getSummon().getStatus().startHpMpRegeneration(); } } @@ -75,6 +76,14 @@ public final class ServitorShare extends AbstractEffect info.getEffected().getActingPlayer().setServitorShare(null); if (info.getEffected().getSummon() != null) { + if (info.getEffected().getSummon().getCurrentHp() > info.getEffected().getSummon().getMaxHp()) + { + info.getEffected().getSummon().setCurrentHp(info.getEffected().getSummon().getMaxHp()); + } + if (info.getEffected().getSummon().getCurrentMp() > info.getEffected().getSummon().getMaxMp()) + { + info.getEffected().getSummon().setCurrentMp(info.getEffected().getSummon().getMaxMp()); + } info.getEffected().getSummon().broadcastInfo(); } } -- GitLab