Prohibit ResurrectionSpecial triggering in olympiad.

This commit is contained in:
MobiusDevelopment
2022-10-02 05:55:18 +00:00
parent 581800ad57
commit 9532fd2d1a
27 changed files with 138 additions and 0 deletions

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -59,6 +59,12 @@ public class ResurrectionSpecial extends AbstractEffect
{ {
return; return;
} }
if (info.getEffected().getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = info.getEffector().getActingPlayer(); final Player caster = info.getEffector().getActingPlayer();
if (info.getEffected().isPlayer()) if (info.getEffected().isPlayer())
{ {

View File

@@ -59,6 +59,12 @@ public class ResurrectionSpecial extends AbstractEffect
{ {
return; return;
} }
if (info.getEffected().getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = info.getEffector().getActingPlayer(); final Player caster = info.getEffector().getActingPlayer();
if (info.getEffected().isPlayer()) if (info.getEffected().isPlayer())
{ {

View File

@@ -59,6 +59,12 @@ public class ResurrectionSpecial extends AbstractEffect
{ {
return; return;
} }
if (info.getEffected().getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = info.getEffector().getActingPlayer(); final Player caster = info.getEffector().getActingPlayer();
if (info.getEffected().isPlayer()) if (info.getEffected().isPlayer())
{ {

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))

View File

@@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect
return; return;
} }
if (effected.getActingPlayer().isInOlympiadMode())
{
return;
}
final Player caster = effector.getActingPlayer(); final Player caster = effector.getActingPlayer();
final Instance instance = caster.getInstanceWorld(); final Instance instance = caster.getInstanceWorld();
if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))