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

Merge branch 'development' into unstable-quests

Browse Source 
# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java
This commit is contained in:
KingRainbow44
2023-04-18 15:36:29 -04:00
parent 0dd41f9350 8c6b166a42
commit 361620de6d
5 changed files with 1321 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
View File

@@ -67,8 +67,8 @@ public class DungeonSystem extends BaseGameSystem {
* @param player The player to send the entry info to.
* @param pointId The dungeon point ID.
*/
public void sendEntryInfoFor(Player player, int pointId) {
var entry = GameData.getScenePointEntryById(player.getScene().getId(), pointId);
public void sendEntryInfoFor(Player player, int pointId, int sceneId) {
var entry = GameData.getScenePointEntryById(sceneId, pointId);
if (entry == null) {
// An invalid point ID was sent.
player.sendPacket(new PacketDungeonEntryInfoRsp());