Skip to content

Commit 1dc723b

Browse files
committed
Fixed dimension teleport crash
1 parent f96d935 commit 1dc723b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
apply plugin: 'net.minecraftforge.gradle.forge'
1111

12-
version = "1.12.2-1.08.4"
12+
version = "1.12.2-1.08.5"
1313
group= "gollorum.signpost"
1414
archivesBaseName = "signpost"
1515

src/main/java/gollorum/signpost/Signpost.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Signpost{
2525
@Instance
2626
public static Signpost instance;
2727
public static final String MODID = "signpost";
28-
public static final String VERSION = "1.08.4";
28+
public static final String VERSION = "1.08.5";
2929

3030
public static final int GuiBaseID = 0;
3131
public static final int GuiPostID = 1;

src/main/java/gollorum/signpost/management/PostHandler.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
import gollorum.signpost.network.messages.ChatMessage;
1010
import gollorum.signpost.network.messages.TeleportRequestMessage;
1111
import gollorum.signpost.util.*;
12+
import net.minecraft.entity.Entity;
1213
import net.minecraft.entity.player.EntityPlayer;
1314
import net.minecraft.entity.player.EntityPlayerMP;
1415
import net.minecraft.init.Blocks;
1516
import net.minecraft.item.Item;
1617
import net.minecraft.item.ItemStack;
1718
import net.minecraft.util.math.BlockPos;
19+
import net.minecraft.world.World;
1820
import net.minecraft.world.WorldServer;
21+
import net.minecraftforge.common.util.ITeleporter;
1922
import net.minecraftforge.fml.common.FMLCommonHandler;
2023
import net.minecraftforge.fml.relauncher.Side;
2124

@@ -251,7 +254,7 @@ public static void confirm(final EntityPlayerMP player){
251254
doPay(player, player.getPosition(), info.destination.teleportPosition.toBlockPos());
252255
SPEventHandler.cancelTask(info.boolRun);
253256
if(player.dimension != info.destination.teleportPosition.dim){
254-
player.changeDimension(info.destination.teleportPosition.dim, null);
257+
player.changeDimension(info.destination.teleportPosition.dim, new SignTeleporter());
255258
}
256259
player.setPositionAndUpdate(info.destination.teleportPosition.x+0.5, info.destination.teleportPosition.y+1, info.destination.teleportPosition.z+0.5);
257260
}
@@ -370,6 +373,12 @@ public static boolean isHandEmpty(EntityPlayer player){
370373
return player.getHeldItemMainhand().getItem().equals(Item.getItemFromBlock(Blocks.AIR));
371374
}
372375

376+
private static class SignTeleporter implements ITeleporter {
377+
378+
@Override
379+
public void placeEntity(World world, Entity entity, float yaw) {}
380+
}
381+
373382
public static StonedHashSet getAllWaystones() {
374383
StonedHashSet ret = SignpostAdapter.INSTANCE.getExternalBaseInfos();
375384
ret.addAll(allWaystones);

0 commit comments

Comments
 (0)