From 4e87e281c908c35e39318d88fb88ddd44cc5cbf1 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 6 Sep 2015 13:23:19 -0400 Subject: [PATCH] Force the player's experience to sync when changing dimensions (Thank you, @Gebatzens) Fixes #2943 Also add misc IDEA files to .gitignore --- .gitignore | 3 +++ src/main/java/mekanism/common/tile/TileEntityTeleporter.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index dda7ff1c7..9cbed3dfa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,9 @@ output .gradle .idea *.iml +*.ipr +*.iws +out Mekanism*.jar MDK.zip diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 360abb24f..e22a0e484 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -25,6 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S07PacketRespawn; import net.minecraft.network.play.server.S1DPacketEntityEffect; +import net.minecraft.network.play.server.S1FPacketSetExperience; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; @@ -397,6 +398,8 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), potioneffect)); } + player.playerNetServerHandler.sendPacket(new S1FPacketSetExperience(player.experience, player.experienceTotal, player.experienceLevel)); // Force XP sync + FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, id, coord.dimensionId); } else {