diff --git a/src/net/torvald/terrarum/blockproperties/BlockCodex.kt b/src/net/torvald/terrarum/blockproperties/BlockCodex.kt index b9848fc5e..caca3234f 100644 --- a/src/net/torvald/terrarum/blockproperties/BlockCodex.kt +++ b/src/net/torvald/terrarum/blockproperties/BlockCodex.kt @@ -42,14 +42,18 @@ object BlockCodex { } } - fun get(index: Int): BlockProp { + /*fun get(index: Int): BlockProp { try { return blockProps[index] } catch (e: NullPointerException) { throw NullPointerException("Blockprop with id $index does not exist.") } - } + catch (e1: ArrayIndexOutOfBoundsException) { + if (index == -1) return nullProp + else throw e1 + } + }*/ operator fun get(rawIndex: Int?): BlockProp { if (rawIndex == null || rawIndex == Block.NULL) { diff --git a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt index 42bc21acb..db65cdbc5 100644 --- a/src/net/torvald/terrarum/gameactors/PhysTestBall.kt +++ b/src/net/torvald/terrarum/gameactors/PhysTestBall.kt @@ -40,5 +40,8 @@ class PhysTestBall : ActorWithPhysics(Actor.RenderOrder.MIDDLE, immobileBody = t hitbox.posY.toFloat(), hitbox.width.toFloat(), hitbox.height.toFloat()) + + + //println(moveDelta) } } \ No newline at end of file diff --git a/src/net/torvald/terrarum/utils/ROTCipher.kt b/src/net/torvald/terrarum/utils/ROTCipher.kt index 30623173f..ef272c990 100644 --- a/src/net/torvald/terrarum/utils/ROTCipher.kt +++ b/src/net/torvald/terrarum/utils/ROTCipher.kt @@ -64,14 +64,14 @@ object ROTCipher { } /** - * Note; range starts with zero + * Note; domain starts from zero * @param number to rotate * @param rotation - * @param range size of the rotation table. 4 means (0,1,2,3) + * @param domain size of the rotation table (or domain of the function). 4 means (0,1,2,3) */ - fun rotN(number: Int, rotation: Int, range: Int): Int { - return if (number < range - rotation + 1) number + rotation - else number - (range - rotation + 1) + private fun rotN(number: Int, rotation: Int, domain: Int): Int { + return if (number < domain - rotation + 1) number + rotation + else number - (domain - rotation + 1) } fun rot13(c: Char): Char {