From 2267dfd29f0973a6576fbbb78b1526667e10133d Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Sat, 25 Jun 2016 00:01:29 -0700 Subject: [PATCH] [Forge] Update to 1.10.2. --- worldedit-forge/build.gradle | 6 +++--- .../java/com/sk89q/worldedit/forge/TileEntityUtils.java | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle index 2193f4ece..cd7563435 100644 --- a/worldedit-forge/build.gradle +++ b/worldedit-forge/build.gradle @@ -27,12 +27,12 @@ repositories { } //version = "6.1.2" -ext.forgeVersion = "12.18.0.1981-1.10.0" +ext.forgeVersion = "12.18.0.2002-1.10.0" //ext.internalVersion = version + ";" + gitCommitHash minecraft { - version = "1.10-${project.forgeVersion}" - mappings = "snapshot_20160623" + version = "1.10.2-${project.forgeVersion}" + mappings = "snapshot_20160629" runDir = 'run' replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java" diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java index b86dae476..77befeb4a 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java @@ -96,8 +96,7 @@ final class TileEntityUtils { static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) { if (tag != null) { updateForSet(tag, position); - // TileEntity.create(World, NBTTagCompound) - TileEntity tileEntity = TileEntity.func_190200_a(world, tag); + TileEntity tileEntity = TileEntity.create(world, tag); if (tileEntity != null) { world.setTileEntity(new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ()), tileEntity); } @@ -123,8 +122,7 @@ final class TileEntityUtils { TileEntity genericTE; try { - // Downcast here for return while retaining the type - genericTE = (TileEntity) baseConstructor.newInstance(); + genericTE = baseConstructor.newInstance(); } catch (Throwable e) { return null; }