From ee6d28bd0085d12ad987392138607f2c6dcf9398 Mon Sep 17 00:00:00 2001 From: Dom Eori <4j6dq2zi8@relay.firefox.com> Date: Fri, 11 Mar 2022 04:05:06 +0900 Subject: [PATCH] [maimai2] Fix endpoint incompatibility with patches --- docs/game_specific_notes.md | 2 +- .../java/icu/samnyan/aqua/sega/allnet/AllNetController.java | 2 +- .../aqua/sega/maimai2/controller/Maimai2ServletController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/game_specific_notes.md b/docs/game_specific_notes.md index f80012ca..c777e884 100644 --- a/docs/game_specific_notes.md +++ b/docs/game_specific_notes.md @@ -45,7 +45,7 @@ Only JP variant is supported. * Tournament mode ### Additional notes -* From version 0.0.25, Aqua reports endpoint as `http://ALLNET_HOST/`. The final endpoint that game connects must be `http://ALLNET_HOST/Maimai2Servlet/`. +* Previous versions of Aqua reported different endpoint URI for Maimai DX thus required compatible patches. Currently, it doesn't matter and both will work. ## O.N.G.E.K.I diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java index 22887ee4..6b8a4b5a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java @@ -141,7 +141,7 @@ public class AllNetController { case "SDEY": return "http://" + addr + ":" + port + "/MaimaiServlet/"; case "SDEZ": - return "http://" + addr + ":" + port + "/"; + return "http://" + addr + ":" + port + "/Maimai2Servlet/"; default: return "http://" + addr + ":" + port + "/"; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java index 6ef91915..53b62e69 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java @@ -14,7 +14,7 @@ import java.util.Map; * @author samnyan (privateamusement@protonmail.com) */ @RestController -@RequestMapping("Maimai2Servlet") +@RequestMapping({"/Maimai2Servlet", "/Maimai2Servlet/Maimai2Servlet"}) // Workaround for endpoint mismatch, let's just accept both public class Maimai2ServletController { private final GetGameSettingHandler getGameSettingHandler;