From 90279bc2a4dcc675f3362adcd99fc3b57e12ae8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 30 Apr 2014 12:56:07 +0200 Subject: [PATCH] Fixed robots derping around with tools. Seems I only tested them *without* tools recently... go me -.- Updated Forge dependency info in mcmod.info. --- src/main/resources/mcmod.info | 4 ++-- src/main/scala/li/cil/oc/server/component/robot/Player.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index fefcbf5a8..d5ee9338a 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -5,10 +5,10 @@ "version": "${version}", "mcversion": "${mcversion}", "url": "https://github.com/MightyPirates/OpenComputers/wiki", - "authorList": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer", "Everyone who contributed to the mod on Github - thank you!"], + "authorList": ["Florian 'Sangar' Nücke", "Johannes 'Lord Joda' Lohrer", "Everyone who contributed to the mod on Github - thank you!"], "credits" : "Inspired by a couple of other mods, most notably ComputerCraft.", "logoFile" : "assets/opencomputers/textures/gui/logo.png", - "requiredMods": [ "Forge@[10.12.0.1024,)" ], + "requiredMods": [ "Forge@[10.12.1.1060,)" ], "dependencies": [ "BuildCraft|Energy", "ComputerCraft", diff --git a/src/main/scala/li/cil/oc/server/component/robot/Player.scala b/src/main/scala/li/cil/oc/server/component/robot/Player.scala index ac905fdcc..7123692b9 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Player.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Player.scala @@ -271,7 +271,7 @@ class Player(val robot: tileentity.Robot) extends EntityPlayer(robot.world, Play } val hardness = block.getBlockHardness(world, x, y, z) - val strength = getBreakSpeed(block, false, x, y, z, metadata) + val strength = getBreakSpeed(block, false, metadata, x, y, z) val breakTime = if (cobwebOverride) Settings.get.swingDelay else hardness * 1.5 / strength