From 573330efd398784f4fc79888955091a63edc3150 Mon Sep 17 00:00:00 2001 From: bdew Date: Wed, 4 Feb 2015 20:27:51 +0200 Subject: [PATCH] Prevent leftover fractional resources due to FP rounding errors --- build.gradle | 2 +- src/net/bdew/lib/resource/DataSlotResource.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1e5b3b3..e61651b 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { apply plugin: 'scala' apply plugin: 'forge' -version = "1.6.0" +version = "1.6.1" if (project.hasProperty('buildnum')) { project.version = project.version + '.' + project.buildnum diff --git a/src/net/bdew/lib/resource/DataSlotResource.scala b/src/net/bdew/lib/resource/DataSlotResource.scala index e35031c..4240473 100644 --- a/src/net/bdew/lib/resource/DataSlotResource.scala +++ b/src/net/bdew/lib/resource/DataSlotResource.scala @@ -56,7 +56,7 @@ class DataSlotResource(val name: String, val parent: TileDataSlots, initCapacity if (onlyRound) canDrain = canDrain.floor if (doDrain) execWithChangeNotify { resource = - if (canDrain == res.amount) + if (res.amount - canDrain < 0.000001) None else Some(Resource(res.kind, res.amount - canDrain))