Do not kill player with RealDamage in olympiad.
Thanks to Fakee.
This commit is contained in:
parent
97180dfefc
commit
581800ad57
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -92,7 +92,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ public class RealDamage extends AbstractEffect
|
||||
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
|
||||
|
||||
// Die.
|
||||
if (effected.getCurrentHp() < 0.5)
|
||||
if ((effected.getCurrentHp() < 0.5) && (!effected.isPlayer() || !effected.getActingPlayer().isInOlympiadMode()))
|
||||
{
|
||||
effected.doDie(effector);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user