Do not kill player with RealDamage in olympiad.

Thanks to Fakee.
This commit is contained in:
MobiusDevelopment 2022-10-02 05:25:56 +00:00
parent 97180dfefc
commit 581800ad57
24 changed files with 24 additions and 24 deletions

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }

View File

@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0)); effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
// Die. // Die.
if (effected.getCurrentHp() < 0.5) if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
{ {
effected.doDie(effector); effected.doDie(effector);
} }