Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-01-10 18:33:20 +08:00
Code Issues Projects Releases Wiki Activity

Remove player from challenge if they are leaving the scene

Browse Source
This commit is contained in:
Melledy 2022-04-29 03:24:36 -07:00
parent cb15a5dec9
commit d877d7eebc
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/emu/grasscutter/game/dungeons/DungeonChallenge.java
View File

@ -23,7 +23,8 @@ public class DungeonChallenge {
private int challengeIndex; private int challengeIndex;
private int challengeId; private int challengeId;
private boolean isSuccess; private boolean success;
private boolean progress;
private int score; private int score;
private int objective = 0; private int objective = 0;
@ -60,11 +61,15 @@ public class DungeonChallenge {
} }
public boolean isSuccess() { public boolean isSuccess() {
return isSuccess; return success;
} }
public void setSuccess(boolean isSuccess) { public void setSuccess(boolean isSuccess) {
this.isSuccess = isSuccess; this.success = isSuccess;
}
public boolean inProgress() {
return progress;
} }
public int getScore() { public int getScore() {
@ -72,10 +77,12 @@ public class DungeonChallenge {
} }
public void start() { public void start() {
this.progress = true;
getScene().broadcastPacket(new PacketDungeonChallengeBeginNotify(this)); getScene().broadcastPacket(new PacketDungeonChallengeBeginNotify(this));
} }
public void finish() { public void finish() {
this.progress = false;
getScene().broadcastPacket(new PacketDungeonChallengeFinishNotify(this)); getScene().broadcastPacket(new PacketDungeonChallengeFinishNotify(this));
if (this.isSuccess()) { if (this.isSuccess()) {

6
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -25,6 +25,7 @@ import emu.grasscutter.scripts.data.SceneBlock;
import emu.grasscutter.scripts.data.SceneGadget; import emu.grasscutter.scripts.data.SceneGadget;
import emu.grasscutter.scripts.data.SceneGroup; import emu.grasscutter.scripts.data.SceneGroup;
import emu.grasscutter.scripts.data.ScriptArgs; import emu.grasscutter.scripts.data.ScriptArgs;
import emu.grasscutter.server.packet.send.PacketDungeonChallengeFinishNotify;
import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify; import emu.grasscutter.server.packet.send.PacketEntityFightPropUpdateNotify;
import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify; import emu.grasscutter.server.packet.send.PacketLifeStateChangeNotify;
import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify; import emu.grasscutter.server.packet.send.PacketSceneEntityAppearNotify;
@ -212,6 +213,11 @@ public class Scene {
} }
public synchronized void removePlayer(Player player) { public synchronized void removePlayer(Player player) {
// Remove from challenge if leaving
if (this.getChallenge() != null && this.getChallenge().inProgress()) {
player.sendPacket(new PacketDungeonChallengeFinishNotify(this.getChallenge()));
}
// Remove player from scene // Remove player from scene
getPlayers().remove(player); getPlayers().remove(player);
player.setScene(null); player.setScene(null);