Skip to content

Fix Crashing When Respawning in Multiplayer #185

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

Merged
calmilamsy merged 1 commit into from
Jun 1, 2025
Merged

Fix Crashing When Respawning in Multiplayer #185

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions ...ng-v0/src/main/java/net/modificationstation/stationapi/impl/world/StationClientWorld.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package net.modificationstation.stationapi.impl.world;

public interface StationClientWorld {
boolean stationAPI$isModded();
}
17 changes: 16 additions & 1 deletion ...ain/java/net/modificationstation/stationapi/mixin/flattening/client/ClientWorldMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

import net.minecraft.block.Block;
import net.minecraft.class_454;
import net.minecraft.client.network.ClientNetworkHandler;
import net.minecraft.world.World;
import net.minecraft.world.dimension.Dimension;
import net.minecraft.world.dimension.DimensionData;
import net.modificationstation.stationapi.api.block.BlockState;
import net.modificationstation.stationapi.api.network.ModdedPacketHandler;
import net.modificationstation.stationapi.impl.client.world.ClientBlockChange;
import net.modificationstation.stationapi.impl.world.StationClientWorld;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
Expand All @@ -17,13 +20,25 @@
import java.util.LinkedList;

@Mixin(class_454.class)
abstract class ClientWorldMixin extends World {
abstract class ClientWorldMixin extends World implements StationClientWorld {
@Unique boolean isModded = false;

@Shadow private LinkedList field_1722;

private ClientWorldMixin(DimensionData arg, String string, Dimension arg2, long l) {
super(arg, string, arg2, l);
}

@Inject(method = "<init>", at = @At("RETURN"))
void mpCrashWorkaround(ClientNetworkHandler handler, long l, int i, CallbackInfo ci) {
isModded = ((ModdedPacketHandler) handler).isModded();
}

@Override
public boolean stationAPI$isModded() {
return isModded;
}

@ModifyConstant(method = "method_1494(IIZ)V", constant = @Constant(intValue = 0))
private int stationapi_changeMinHeight(int value) {
return getBottomY();
Expand Down
4 changes: 2 additions & 2 deletions ...et/modificationstation/stationapi/mixin/flattening/client/MultiplayerChunkCacheMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.modificationstation.stationapi.api.network.ModdedPacketHandler;
import net.modificationstation.stationapi.impl.world.StationClientWorld;
import net.modificationstation.stationapi.impl.world.chunk.FlattenedChunk;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand All @@ -28,8 +29,7 @@ class MultiplayerChunkCacheMixin {
cancellable = true
)
public void stationapi_loadChunk(int i, int j, CallbackInfoReturnable<Chunk> cir) {
//noinspection deprecation
if (!((ModdedPacketHandler) ((Minecraft) FabricLoader.getInstance().getGameInstance()).getNetworkHandler()).isModded())
if (!((StationClientWorld) field_2555).stationAPI$isModded())
return;
ChunkPos vec2i = new ChunkPos(i, j);
FlattenedChunk chunk = new FlattenedChunk(this.field_2555, i, j);
Expand Down