Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-04-04 06:52:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Run spotlessApply"

Browse Source 
This reverts commit d67e2d0c5e.
This commit is contained in:
KingRainbow44
2023-05-03 10:48:00 -04:00
parent 40a7d088d0
commit 3df5f79ebf
1412 changed files with 1213844 additions and 1308701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java
View File

@@ -273,9 +273,8 @@ public final class DungeonManager {
public void finishDungeon() {
// Mark the dungeon has completed for the players.
var dungeonId = this.getDungeonData().getId();
this.getScene()
.getPlayers()
.forEach(player -> player.getPlayerProgress().markDungeonAsComplete(dungeonId));
this.getScene().getPlayers().forEach(player -> player
.getPlayerProgress().markDungeonAsComplete(dungeonId));
notifyEndDungeon(true);
endDungeon(BaseDungeonResult.DungeonEndReason.COMPLETED);
@@ -288,8 +287,8 @@ public final class DungeonManager {
p -> {
// Trigger the fail event if needed.
if (!successfully) {
p.getQuestManager()
.queueEvent(QuestContent.QUEST_CONTENT_FAIL_DUNGEON, dungeonData.getId());
p.getQuestManager().queueEvent(
QuestContent.QUEST_CONTENT_FAIL_DUNGEON, dungeonData.getId());
}
// Battle pass trigger

40
src/main/java/emu/grasscutter/game/dungeons/challenge/WorldChallenge.java
View File

@@ -16,6 +16,7 @@ import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import lombok.Getter;
import lombok.Setter;
@@ -108,18 +109,14 @@ public class WorldChallenge {
var eventSource = new AtomicReference<>("");
// TODO: This is a hack to get the event source.
// This should be properly implemented.
scriptManager
.getTriggersByEvent(EventType.EVENT_CHALLENGE_SUCCESS)
.forEach(
trigger -> {
if (trigger.currentGroup.id == this.getGroup().id) {
eventSource.set(trigger.getSource());
}
});
scriptManager.callEvent(
new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_SUCCESS)
.setParam2(finishedTime)
.setEventSource(eventSource.get()));
scriptManager.getTriggersByEvent(EventType.EVENT_CHALLENGE_SUCCESS)
.forEach(trigger -> {
if (trigger.currentGroup.id == this.getGroup().id) {
eventSource.set(trigger.getSource());
}
});
scriptManager.callEvent(new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_SUCCESS)
.setParam2(finishedTime).setEventSource(eventSource.get()));
this.getScene()
.triggerDungeonEvent(
@@ -140,18 +137,15 @@ public class WorldChallenge {
// TODO: This is a hack to get the event source.
// This should be properly implemented.
var scriptManager = this.getScene().getScriptManager();
scriptManager
.getTriggersByEvent(EventType.EVENT_CHALLENGE_FAIL)
.forEach(
trigger -> {
if (trigger.currentGroup.id == this.getGroup().id) {
eventSource.set(trigger.getSource());
}
});
scriptManager.getTriggersByEvent(EventType.EVENT_CHALLENGE_FAIL)
.forEach(trigger -> {
if (trigger.currentGroup.id == this.getGroup().id) {
eventSource.set(trigger.getSource());
}
});
scriptManager.callEvent(
new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_FAIL)
.setEventSource(eventSource.get()));
scriptManager.callEvent(new ScriptArgs(this.getGroup().id, EventType.EVENT_CHALLENGE_FAIL)
.setEventSource(eventSource.get()));
challengeTriggers.forEach(t -> t.onFinish(this));
}