From ca12c83c25c484647a6effadc86c3fcfdc4d2aea Mon Sep 17 00:00:00 2001 From: fullwall Date: Mon, 19 Aug 2024 20:43:26 +0800 Subject: [PATCH] Fix auth server url --- .../main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java | 2 +- .../net/citizensnpcs/nms/v1_21_R1/entity/CodController.java | 3 +-- .../main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java index 544fff633..e24cb01e0 100644 --- a/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java +++ b/v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/util/NMSImpl.java @@ -565,7 +565,7 @@ public class NMSImpl implements NMSBridge { if (!(sessionService instanceof YggdrasilMinecraftSessionService)) return sessionService.fetchProfile(profile.getId(), requireSecure).profile(); URL url = HttpAuthenticationService - .constantURL(getAuthServerBaseUrl() + "profile/" + UndashedUuid.toString(profile.getId())); + .constantURL(getAuthServerBaseUrl() + "/" + UndashedUuid.toString(profile.getId())); url = HttpAuthenticationService.concatenateURL(url, "unsigned=" + !requireSecure); MinecraftClient client = (MinecraftClient) MINECRAFT_CLIENT.invoke(sessionService); MinecraftProfilePropertiesResponse response = client.get(url, MinecraftProfilePropertiesResponse.class); diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java index 6df3ef763..9673e1bae 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java @@ -6,7 +6,6 @@ import org.bukkit.craftbukkit.v1_21_R1.entity.CraftCod; import org.bukkit.craftbukkit.v1_21_R1.entity.CraftEntity; import net.citizensnpcs.api.npc.NPC; -import net.citizensnpcs.nms.v1_21_R1.util.EntityMoveControl; import net.citizensnpcs.nms.v1_21_R1.util.ForwardingNPCHolder; import net.citizensnpcs.nms.v1_21_R1.util.NMSBoundingBox; import net.citizensnpcs.nms.v1_21_R1.util.NMSImpl; @@ -130,7 +129,7 @@ public class CodController extends MobEntityController { this.moveControl = this.oldMoveController; } if (!npc.useMinecraftAI() && this.moveControl == this.oldMoveController) { - this.moveControl = new EntityMoveControl(this); + this.moveControl = new MoveControl(this); } } super.customServerAiStep(); diff --git a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java index fdf6b0ab2..cb6ac4b77 100644 --- a/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java +++ b/v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/util/NMSImpl.java @@ -544,7 +544,7 @@ public class NMSImpl implements NMSBridge { if (!(sessionService instanceof YggdrasilMinecraftSessionService)) return sessionService.fetchProfile(profile.getId(), requireSecure).profile(); URL url = HttpAuthenticationService - .constantURL(getAuthServerBaseUrl() + "profile/" + UndashedUuid.toString(profile.getId())); + .constantURL(getAuthServerBaseUrl() + "/" + UndashedUuid.toString(profile.getId())); url = HttpAuthenticationService.concatenateURL(url, "unsigned=" + !requireSecure); MinecraftClient client = (MinecraftClient) MINECRAFT_CLIENT.invoke(sessionService); MinecraftProfilePropertiesResponse response = client.get(url, MinecraftProfilePropertiesResponse.class);