Skip to content

Commit 3fc985c

Browse files
authored
Fix spectate command resetting gamemode when spectating someone in another dimension (#2365)
* Fix gamemode change on dimension change This issue happened when using the spectate command on a player in another dimension. the spectator was set to survival mode. * Fix player gamemode reset bug When spectating a player in another dimension, you would previously get set to survival mode, this is now fixed.
1 parent 499bf7e commit 3fc985c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

common/src/main/java/ac/grim/grimac/events/packets/PacketPlayerRespawn.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ public void onPacketSend(PacketSendEvent event) {
210210
}
211211
player.pose = Pose.STANDING;
212212
player.clientVelocity = new Vector3dm();
213-
player.gamemode = respawn.getGameMode();
213+
if (!GrimAPI.INSTANCE.getSpectateManager().isSpectating(player.uuid)) {
214+
player.gamemode = respawn.getGameMode();
215+
}
214216
if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_17)) {
215217
player.compensatedWorld.setDimension(respawn.getDimensionType(), event.getUser());
216218
}

0 commit comments

Comments
 (0)