Skip to content

fixed bug #454 #456

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
wants to merge 2 commits into
base: 1.20.1-multiplatform
Choose a base branch
from
Open

fixed bug #454 #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7f0ee6
fixed bug #454
ForgotTheColon Jan 3, 2025
825ff70
same thing, different implementation
ForgotTheColon Jan 10, 2025
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
9 changes: 9 additions & 0 deletions common/src/main/java/org/dimdev/dimdoors/api/util/Location.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.level.material.FluidState;
import org.dimdev.dimdoors.DimensionalDoors;

Expand Down Expand Up @@ -101,4 +102,12 @@ public static Location fromNbt(CompoundTag nbt) {
new BlockPos(pos[0], pos[1], pos[2])
);
}

//Does not check for "hasChunk" like getHeightmapPos. Is that safe? I don't know. But it fixes teleporting at bedrock.
public static BlockPos getHeightmapPosSafe(ServerLevel level, Heightmap.Types heightmapType, BlockPos pos) {
//net.minecraft.world.level.Level, taken directly from getHeight
var y = level.getChunkAt(pos).getHeight(heightmapType, pos.getX() & 15, pos.getZ() & 15) + 1;

return new BlockPos(pos.getX(), y, pos.getZ());
}
}
6 changes: 3 additions & 3 deletions common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,15 @@ public boolean receiveEntity(Entity entity, Vec3 relativePos, Rotations relative
if (DimensionalDoors.getWorld(targetWorldResourceKey) != null) {
LOGGER.log(Level.INFO, "Sending player from limbo to the exit dimension, good luck!");
var level = DimensionalDoors.getWorld(targetWorldResourceKey);
destLoc = new Location(level, level.getHeightmapPos(Heightmap.Types.WORLD_SURFACE, entity.blockPosition()));
destLoc = new Location(level, Location.getHeightmapPosSafe(level, Heightmap.Types.WORLD_SURFACE, entity.blockPosition()));
} else {
LOGGER.log(Level.INFO, "Target dimension defined in config does not exist. Use /forge dimensions for a list!");
LOGGER.log(Level.INFO, "Sending player from limbo to worldspawn, good luck!");
destLoc = new Location(DimensionalDoors.getServer().overworld(), DimensionalDoors.getServer().overworld().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, DimensionalDoors.getServer().overworld().getSharedSpawnPos()));
destLoc = new Location(DimensionalDoors.getServer().overworld(), Location.getHeightmapPosSafe(DimensionalDoors.getServer().overworld(), Heightmap.Types.WORLD_SURFACE, DimensionalDoors.getServer().overworld().getSharedSpawnPos()));
}
} else {
LOGGER.log(Level.INFO, "sending player from limbo to worldspawn, good luck!");
destLoc = new Location(DimensionalDoors.getServer().overworld(), DimensionalDoors.getServer().overworld().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, DimensionalDoors.getServer().overworld().getSharedSpawnPos()));
destLoc = new Location(DimensionalDoors.getServer().overworld(), Location.getHeightmapPosSafe(DimensionalDoors.getServer().overworld(), Heightmap.Types.WORLD_SURFACE, DimensionalDoors.getServer().overworld().getSharedSpawnPos()));
}


Expand Down