Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: beyond-aion/aion-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53e6a1dc5ca3e32ffb714a671ebba52639aafcaa
Choose a base ref
..
head repository: beyond-aion/aion-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ea30933a59fd9074caea2204c2dc6139e4cc05ca
Choose a head ref
Showing with 4 additions and 4 deletions.
  1. +4 −4 game-server/data/handlers/instance/crucible/EmpyreanCrucibleInstance.java
8 changes: 4 additions & 4 deletions game-server/data/handlers/instance/crucible/EmpyreanCrucibleInstance.java
View file
Original file line number Diff line number Diff line change
@@ -298,7 +298,7 @@ public void onDie(Npc npc) {
}
case 217511, 217512, 217513, 217514 -> {
npc.getController().delete();
if (instance.getNpcs(217511, 217512, 217513, 217514).allMatch(id -> getNpcs(id).isEmpty())) {
if (instance.getNpcs(217511, 217512, 217513, 217514).isEmpty()) {
setStage(StageType.START_STAGE_3_ROUND_2, 2000);
sp(217515, 336.32092f, 345.0251f, 96.090935f, (byte) 0, 6000); // S3_ElementalEarth_2nd_55_Ae
sp(217516, 347.16144f, 361.89084f, 96.09093f, (byte) 0, 6000); // S3_ElementalFire_2nd_55_Ae
@@ -346,7 +346,7 @@ public void onDie(Npc npc) {
}
case 217527, 217528 -> {
npc.getController().delete();
if (instance.getNpcs(217527, 217528).allMatch(id -> getNpcs(id).isEmpty())) {
if (instance.getNpcs(217527, 217528).isEmpty()) {
setStage(StageType.START_BONUS_STAGE_3, 7000);
sp(217744, 342.45215f, 349.339f, 96.09096f, (byte) 0, 7000); // S3_Elemeltal_CTRL
ThreadPoolManager.getInstance().schedule(this::startBonusStage3, 39000);
@@ -356,7 +356,7 @@ public void onDie(Npc npc) {
npc.getController().delete();
switch (stageType) {
case START_STAGE_4_ROUND_1 -> {
if (instance.getNpcs(217557, 217559, 217562).allMatch(id -> getNpcs(id).isEmpty())) {
if (instance.getNpcs(217557, 217559, 217562).isEmpty()) {
sp(217558, 330.27792f, 339.2779f, 96.09093f, (byte) 6); // S5_Lizard_As_55_Ae
sp(217558, 328.08972f, 346.3553f, 96.090904f, (byte) 1); // S5_Lizard_As_55_Ae
}
@@ -420,7 +420,7 @@ public void onDie(Npc npc) {
}
case 217651, 217652, 217653 -> {
npc.getController().delete();
if (isDoneStage4 && instance.getNpcs(217651, 217652, 217653).allMatch(id -> getNpcs(id).isEmpty())) {
if (isDoneStage4 && instance.getNpcs(217651, 217652, 217653).isEmpty()) {
setStage(StageType.PASS_GROUP_STAGE_4, 0);
sp(217749, 340.59f, 349.32166f, 96.09096f, (byte) 0, 6000); // S4_Draky_CTRL
setStage(StageType.START_BONUS_STAGE_4, 6000);