Merge branch 'master' into development

This commit is contained in:
aidancbrady 2015-11-25 10:10:04 -07:00
commit 79483d1fa7

View file

@ -40,8 +40,9 @@ public class CCPeripheral implements IPeripheral
return computerTile.invoke(method, arguments); return computerTile.invoke(method, arguments);
} catch(NoSuchMethodException e) { } catch(NoSuchMethodException e) {
return new Object[] {"Unknown command."}; return new Object[] {"Unknown command."};
} finally { } catch(Exception e) {
return new Object[] {"Error."}; e.printStackTrace();
return new Object[] {"Error."};
} }
} }