Skip to content

[Traveller's Backpack sleeping bag incompatibility] fix: keep sub-level spawn on cancelled spawn set #1611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UQuark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Traveller's Backpack sleeping bag incompatibility] fix: keep sub-level spawn on cancelled spawn set #1611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 61 additions & 20 deletions common/src/main/java/dev/ryanhcode/sable/mixin/respawn_point/ServerPlayerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.Objects;
import java.util.Optional;
import java.util.UUID;

Expand All @@ -53,6 +54,13 @@ public abstract class ServerPlayerMixin implements ServerPlayerRespawnExtension
private UUID sable$respawnPoint = null;
@Unique
private Pair<UUID, Vector3d> sable$queuedFreeze = null;
@Unique
@Nullable
private UUID sable$respawnPointBefore = null;
@Unique
private @Nullable BlockPos sable$respawnPosBefore = null;
@Unique
private @Nullable ResourceKey<Level> sable$respawnDimBefore = null;

@Shadow
public static Optional<ServerPlayer.RespawnPosAngle> findRespawnAndUseSpawnBlock(final ServerLevel serverLevel, final BlockPos blockPos, final float f, final boolean bl, final boolean bl2) {
Expand All @@ -72,36 +80,69 @@ public static Optional<ServerPlayer.RespawnPosAngle> findRespawnAndUseSpawnBlock

@Inject(method = "setRespawnPosition", at = @At("HEAD"), cancellable = true)
private void sable$setRespawnPosition(final ResourceKey<Level> resourceKey, @Nullable final BlockPos blockPos, final float f, final boolean bl, final boolean sendMessage, final CallbackInfo ci) {
final ServerLevel level = this.serverLevel();
final SubLevelTrackingPointSavedData data = SubLevelTrackingPointSavedData.getOrLoad(level);

if (this.sable$respawnPoint != null) {
data.removeTrackingPoint(this.sable$respawnPoint);
this.sable$respawnPoint = null;
// Snapshot the state so a call that is ultimately a no-op (e.g. cancelled by another
// mod's PlayerSetSpawnEvent handler) does not destroy the tracked sub-level point.
this.sable$respawnPointBefore = this.sable$respawnPoint;
this.sable$respawnPosBefore = this.respawnPosition;
this.sable$respawnDimBefore = this.respawnDimension;

if (blockPos == null) {
// Spawn is being reset; let vanilla/NeoForge handle it and reconcile at RETURN.
return;
}

if (blockPos != null) {
final SubLevel trackingSubLevel = Sable.HELPER.getContaining(level, blockPos);
final ServerLevel level = this.serverLevel();
final SubLevel trackingSubLevel = Sable.HELPER.getContaining(level, blockPos);

if (trackingSubLevel instanceof final ServerSubLevel serverSubLevel) {
this.sable$respawnPoint = data.generateTrackingPoint(Vec3.atCenterOf(blockPos), serverSubLevel);
if (trackingSubLevel instanceof final ServerSubLevel serverSubLevel) {
final SubLevelTrackingPointSavedData data = SubLevelTrackingPointSavedData.getOrLoad(level);

if (this.sable$respawnPoint != null) {
final boolean theSame = blockPos.equals(this.respawnPosition) && resourceKey.equals(this.respawnDimension);
if (sendMessage && !theSame) {
this.sendSystemMessage(Component.translatable("block.minecraft.set_spawn"));
}
if (this.sable$respawnPoint != null) {
data.removeTrackingPoint(this.sable$respawnPoint);
this.sable$respawnPoint = null;
}

this.sable$respawnPoint = data.generateTrackingPoint(Vec3.atCenterOf(blockPos), serverSubLevel);

this.respawnPosition = blockPos;
this.respawnDimension = resourceKey;
this.respawnAngle = f;
this.respawnForced = bl;
ci.cancel();
if (this.sable$respawnPoint != null) {
final boolean theSame = blockPos.equals(this.respawnPosition) && resourceKey.equals(this.respawnDimension);
if (sendMessage && !theSame) {
this.sendSystemMessage(Component.translatable("block.minecraft.set_spawn"));
}

this.respawnPosition = blockPos;
this.respawnDimension = resourceKey;
this.respawnAngle = f;
this.respawnForced = bl;
ci.cancel();
}
}
}

@Inject(method = "setRespawnPosition", at = @At("RETURN"))
private void sable$reconcileRespawnPoint(final ResourceKey<Level> resourceKey, @Nullable final BlockPos blockPos, final float f, final boolean bl, final boolean sendMessage, final CallbackInfo ci) {
final BlockPos posBefore = this.sable$respawnPosBefore;
final ResourceKey<Level> dimBefore = this.sable$respawnDimBefore;
this.sable$respawnPosBefore = null;
this.sable$respawnDimBefore = null;

final boolean changed = !Objects.equals(this.respawnPosition, posBefore)
|| !Objects.equals(this.respawnDimension, dimBefore);

// Only drop the tracked point when this call actually committed a non-sub-level spawn (or
// a reset), and it is still the same point we entered the method with. A no-op call keeps
// the point intact; a freshly generated sub-level point is never clobbered.
if (changed
&& this.sable$respawnPoint != null
&& Objects.equals(this.sable$respawnPoint, this.sable$respawnPointBefore)) {
SubLevelTrackingPointSavedData.getOrLoad(this.serverLevel())
.removeTrackingPoint(this.sable$respawnPoint);
this.sable$respawnPoint = null;
}

this.sable$respawnPointBefore = null;
}

@Inject(method = "addAdditionalSaveData", at = @At("TAIL"))
private void sable$addRespawnPoint(final CompoundTag compoundTag, final CallbackInfo ci) {
if (this.sable$respawnPoint != null) {
Expand Down