diff --git a/patches/minecraft/net/minecraft/command/impl/TeleportCommand.java.patch b/patches/minecraft/net/minecraft/command/impl/TeleportCommand.java.patch index 87f01b4cd6..eb512d734b 100644 --- a/patches/minecraft/net/minecraft/command/impl/TeleportCommand.java.patch +++ b/patches/minecraft/net/minecraft/command/impl/TeleportCommand.java.patch @@ -5,7 +5,7 @@ private static int func_201126_a(CommandSource p_201126_0_, Collection p_201126_1_, Entity p_201126_2_) { for(Entity entity : p_201126_1_) { - func_201127_a(p_201126_0_, entity, p_201126_0_.func_197023_e(), p_201126_2_.field_70165_t, p_201126_2_.field_70163_u, p_201126_2_.field_70161_v, EnumSet.noneOf(SPacketPlayerPosLook.EnumFlags.class), p_201126_2_.field_70177_z, p_201126_2_.field_70125_A, (TeleportCommand.Facing)null); -+ func_201127_a(p_201126_0_, entity, (WorldServer) p_201126_2_.func_130014_f_(), p_201126_2_.field_70165_t, p_201126_2_.field_70163_u, p_201126_2_.field_70161_v, EnumSet.noneOf(SPacketPlayerPosLook.EnumFlags.class), p_201126_2_.field_70177_z, p_201126_2_.field_70125_A, (TeleportCommand.Facing)null); ++ func_201127_a(p_201126_0_, entity, (WorldServer) p_201126_2_.func_130014_f_(), p_201126_2_.field_70165_t, p_201126_2_.field_70163_u, p_201126_2_.field_70161_v, EnumSet.noneOf(SPacketPlayerPosLook.EnumFlags.class), p_201126_2_.field_70177_z, p_201126_2_.field_70125_A, (TeleportCommand.Facing)null); // Forge: Fix MC-128441 cross-dimension teleporting does not work } if (p_201126_1_.size() == 1) { diff --git a/skipped_commits.md b/skipped_commits.md index bdd1bb9a9e..dddbbbe65d 100644 --- a/skipped_commits.md +++ b/skipped_commits.md @@ -34,4 +34,4 @@ |[Try and make 1.13 mods more obviously wrong in 1.12..](https://github.com/MinecraftForge/MinecraftForge/commit/1f12642a05e4f97ff1d83abb1a7c787422490900) | No | | -Currently updated through: 1f12642a05e4f97ff1d83abb1a7c787422490900 +Currently updated through: 1752e57ea03394e5fe184301599b2a2e6c453e42 diff --git a/src/userdev/java/net/minecraftforge/userdev/LaunchTesting.java b/src/userdev/java/net/minecraftforge/userdev/LaunchTesting.java index 037a2a1653..80e0d4868b 100644 --- a/src/userdev/java/net/minecraftforge/userdev/LaunchTesting.java +++ b/src/userdev/java/net/minecraftforge/userdev/LaunchTesting.java @@ -37,7 +37,7 @@ import java.util.regex.Pattern; import org.apache.logging.log4j.LogManager; public class LaunchTesting -{ +{ public static void main(String... args) throws InterruptedException { final String markerselection = System.getProperty("forge.logging.markers", "");