teleport

DimensionalDevelopment · Nov 19, 2024 · fdca94f · fdca94f · ForgotTheColon · Jan 3, 2025
1 parent 2721ac6
commit fdca94f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/common/src/main/java/org/dimdev/dimdoors/ModConfig.java b/common/src/main/java/org/dimdev/dimdoors/ModConfig.java
@@ -179,7 +179,7 @@ public static class Limbo {
 		@RequiresRestart
 		@Tooltip private WorldList worldsLeadingToLimbo = new WorldList();
 		@Tooltip public boolean hardcoreLimbo = false;
-		@Tooltip public int limboReturnDistance = 5000;
+		@Tooltip public int limboReturnDistance = 100;
 		@Tooltip public float limboBlocksCorruptingExitWorldAmount = 5;
 		@Tooltip @Nullable public ResourceKey<Level> escapeTargetWorld = Level.OVERWORLD;
 		@Tooltip public int escapeTargetWorldYSpawn = 64;

diff --git a/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java b/common/src/main/java/org/dimdev/dimdoors/rift/targets/EscapeTarget.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
@@ -70,15 +71,16 @@ public boolean receiveEntity(Entity entity, Vec3 relativePos, Rotations relative
 				targetWorldResourceKey = DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorld;
 				if (DimensionalDoors.getWorld(targetWorldResourceKey) != null) {
 					LOGGER.log(Level.INFO, "Sending player from limbo to the exit dimension, good luck!");
-					destLoc = new Location(DimensionalDoors.getWorld(targetWorldResourceKey), new BlockPos(entity.blockPosition().getX(), DimensionalDoors.getConfig().getLimboConfig().escapeTargetWorldYSpawn, entity.blockPosition().getZ()));
+					var level = DimensionalDoors.getWorld(targetWorldResourceKey);
+					destLoc = new Location(level, level.getHeightmapPos(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().getSharedSpawnPos());
+					destLoc = new Location(DimensionalDoors.getServer().overworld(), DimensionalDoors.getServer().overworld().getHeightmapPos(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().getSharedSpawnPos());
+				destLoc = new Location(DimensionalDoors.getServer().overworld(), DimensionalDoors.getServer().overworld().getHeightmapPos(Heightmap.Types.WORLD_SURFACE, DimensionalDoors.getServer().overworld().getSharedSpawnPos()));
 			}
 
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -40,7 +40,6 @@ dependencies {
     include "com.github.DimensionalDevelopment:poly2tri.java:0.1.1"
 
     modApi "mcp.mobius.waila:wthit-api:forge-${wthitVersion}"
-    modApi "mcp.mobius.waila:wthit:forge-${wthitVersion}"
 //    modApi "lol.bai:badpackets:forge-0.4.2"
 //    modApi "com.sk89q.worldedit:worldedit-forge-mc${rootProject.world_edit_minecraft_version}:${rootProject.worldedit}"
     modApi("curse.maven:worldedit-${project.properties["worldedit_CF"]}:${project.properties["worldedit_CF_version"]}")